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.446 by root, Thu May 22 18:54:33 2014 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 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
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 (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;
1165
1166 want_refresh = 1; 1245 want_refresh = 1;
1167 ZERO_SCROLLBACK (); 1246 ZERO_SCROLLBACK ();
1168 1247
1169 dirn = ((direction == UP) ? 1 : -1);
1170
1171 screen.flags &= ~Screen_WrapNext; 1248 screen.flags &= ~Screen_WrapNext;
1172 1249
1173 if ((screen.cur.row == screen.bscroll && direction == UP) 1250 if ((screen.cur.row == screen.bscroll && direction == UP)
1174 || (screen.cur.row == screen.tscroll && direction == DN)) 1251 || (screen.cur.row == screen.tscroll && direction == DN))
1175 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1252 scr_scroll_text (screen.tscroll, screen.bscroll, direction);
1176 else 1253 else
1177 screen.cur.row += dirn; 1254 screen.cur.row += direction;
1178 1255
1179 clamp_it (screen.cur.row, 0, nrow - 1); 1256 clamp_it (screen.cur.row, 0, nrow - 1);
1180 selection_check (0); 1257 selection_check (0);
1181} 1258}
1182 1259
… …
1184/* 1261/*
1185 * Erase part or whole of a line 1262 * Erase part or whole of a line
1186 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1263 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1187 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1264 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1188 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1265 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1266 * extension: clear to right unless wrapped: ESC [ 3 K
1189 */ 1267 */
1190void 1268void
1191rxvt_term::scr_erase_line (int mode) 1269rxvt_term::scr_erase_line (int mode) NOTHROW
1192{ 1270{
1193 unsigned int col, num; 1271 unsigned int col, num;
1194 1272
1195 want_refresh = 1; 1273 want_refresh = 1;
1196 ZERO_SCROLLBACK (); 1274 ZERO_SCROLLBACK ();
1197 1275
1198 selection_check (1); 1276 selection_check (1);
1199 1277
1200 line_t &line = ROW(screen.cur.row); 1278 line_t &line = ROW(screen.cur.row);
1201 1279
1280 line.touch ();
1281 line.is_longer (0);
1282
1202 switch (mode) 1283 switch (mode)
1203 { 1284 {
1285 case 3:
1286 if (screen.flags & Screen_WrapNext)
1287 return;
1288
1289 /* fall through */
1290
1204 case 0: /* erase to end of line */ 1291 case 0: /* erase to end of line */
1205 col = screen.cur.col; 1292 col = screen.cur.col;
1206 num = ncol - col; 1293 num = ncol - col;
1207 min_it (line.l, col); 1294 min_it (line.l, col);
1295
1208 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1296 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1209 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1297 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1210 CLEAR_SELECTION (); 1298 CLEAR_SELECTION ();
1211 break; 1299 break;
1300
1212 case 1: /* erase to beginning of line */ 1301 case 1: /* erase to beginning of line */
1213 col = 0; 1302 col = 0;
1214 num = screen.cur.col + 1; 1303 num = screen.cur.col + 1;
1304
1215 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1305 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1216 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1306 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1217 CLEAR_SELECTION (); 1307 CLEAR_SELECTION ();
1218 break; 1308 break;
1309
1219 case 2: /* erase whole line */ 1310 case 2: /* erase whole line */
1220 col = 0; 1311 col = 0;
1221 num = ncol; 1312 num = ncol;
1222 line.l = 0; 1313 line.l = 0;
1223 if (selection.beg.row <= screen.cur.row 1314 if (selection.beg.row <= screen.cur.row
… …
1231 scr_blank_line (line, col, num, rstyle); 1322 scr_blank_line (line, col, num, rstyle);
1232} 1323}
1233 1324
1234/* ------------------------------------------------------------------------- */ 1325/* ------------------------------------------------------------------------- */
1235/* 1326/*
1236 * Erase part of whole of the screen 1327 * Erase part or whole of the screen
1237 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1328 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1238 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1329 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1239 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1330 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1240 */ 1331 */
1241void 1332void
1242rxvt_term::scr_erase_screen (int mode) 1333rxvt_term::scr_erase_screen (int mode) NOTHROW
1243{ 1334{
1244 int num; 1335 int num;
1245 int32_t row; 1336 int32_t row;
1246 rend_t ren; 1337 rend_t ren;
1247 XGCValues gcvalue; 1338 XGCValues gcvalue;
… …
1250 ZERO_SCROLLBACK (); 1341 ZERO_SCROLLBACK ();
1251 1342
1252 switch (mode) 1343 switch (mode)
1253 { 1344 {
1254 case 0: /* erase to end of screen */ 1345 case 0: /* erase to end of screen */
1255 selection_check (1);
1256 scr_erase_line (0); 1346 scr_erase_line (0);
1257 row = screen.cur.row + 1; /* possible OOB */ 1347 row = screen.cur.row + 1; /* possible OOB */
1258 num = nrow - row; 1348 num = nrow - row;
1259 break; 1349 break;
1260 case 1: /* erase to beginning of screen */ 1350 case 1: /* erase to beginning of screen */
1261 selection_check (3);
1262 scr_erase_line (1); 1351 scr_erase_line (1);
1263 row = 0; 1352 row = 0;
1264 num = screen.cur.row; 1353 num = screen.cur.row;
1265 break; 1354 break;
1266 case 2: /* erase whole screen */ 1355 case 2: /* erase whole screen */
1267 selection_check (3);
1268 row = 0; 1356 row = 0;
1269 num = nrow; 1357 num = nrow;
1270 break; 1358 break;
1271 default: 1359 default:
1272 return; 1360 return;
… …
1281 if (row >= nrow) /* Out Of Bounds */ 1369 if (row >= nrow) /* Out Of Bounds */
1282 return; 1370 return;
1283 1371
1284 min_it (num, nrow - row); 1372 min_it (num, nrow - row);
1285 1373
1286 if (rstyle & (RS_RVid | RS_Uline)) 1374 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1287 ren = (rend_t) ~RS_None; 1375 ren = (rend_t) ~RS_None;
1288 else if (GET_BASEBG (rstyle) == Color_bg) 1376 else if (GET_BASEBG (rstyle) == Color_bg)
1289 { 1377 {
1290 ren = DEFAULT_RSTYLE; 1378 ren = DEFAULT_RSTYLE;
1291 CLEAR_ROWS (row, num); 1379
1380 if (mapped)
1381 XClearArea (dpy, vt, 0,
1382 Row2Pixel (row - view_start), (unsigned int)vt_width,
1383 (unsigned int)Height2Pixel (num), False);
1292 } 1384 }
1293 else 1385 else
1294 { 1386 {
1295 ren = rstyle & (RS_fgMask | RS_bgMask); 1387 ren = rstyle & (RS_fgMask | RS_bgMask);
1388
1389 if (mapped)
1390 {
1296 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1391 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1297 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1392 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1298 ERASE_ROWS (row, num); 1393 XFillRectangle (dpy, vt, gc,
1394 0, Row2Pixel (row - view_start),
1395 (unsigned int)vt_width,
1396 (unsigned int)Height2Pixel (num));
1299 gcvalue.foreground = pix_colors[Color_fg]; 1397 gcvalue.foreground = pix_colors[Color_fg];
1300 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1398 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1399 }
1301 } 1400 }
1302 1401
1303 for (; num--; row++) 1402 for (; num--; row++)
1304 { 1403 {
1305 ROW (row).l = 0;
1306 scr_blank_screen_mem (ROW (row), rstyle); 1404 scr_blank_screen_mem (ROW(row), rstyle);
1405
1406 if (row - view_start < nrow)
1307 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1407 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1308 } 1408 }
1309} 1409}
1310 1410
1311#if ENABLE_FRILLS 1411#if !ENABLE_MINIMAL
1312void 1412void
1313rxvt_term::scr_erase_savelines () 1413rxvt_term::scr_erase_savelines () NOTHROW
1314{ 1414{
1315 want_refresh = 1; 1415 want_refresh = 1;
1316 ZERO_SCROLLBACK (); 1416 ZERO_SCROLLBACK ();
1317 1417
1318 nsaved = 0; 1418 top_row = 0;
1319} 1419}
1320#endif 1420#endif
1321 1421
1322/* ------------------------------------------------------------------------- */ 1422/* ------------------------------------------------------------------------- */
1323/* 1423/*
1324 * Fill the screen with `E's 1424 * Fill the screen with `E's
1325 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1425 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1326 */ 1426 */
1327void 1427void ecb_cold
1328rxvt_term::scr_E () 1428rxvt_term::scr_E () NOTHROW
1329{ 1429{
1330 rend_t fs; 1430 rend_t fs;
1331 1431
1332 want_refresh = 1; 1432 want_refresh = 1;
1333 ZERO_SCROLLBACK (); 1433 ZERO_SCROLLBACK ();
1334 1434
1335 num_scr_allow = 0; 1435 num_scr_allow = 0;
1336 selection_check (3); 1436
1437 row_col_t pos;
1438 pos.row = pos.col = 0;
1439 if (ROWCOL_IS_AFTER (selection.end, pos))
1440 CLEAR_SELECTION ();
1337 1441
1338 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1442 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1339 for (int row = nrow; row--; ) 1443 for (int row = nrow; row--; )
1340 { 1444 {
1341 line_t &line = ROW(row); 1445 line_t &line = ROW(row);
… …
1344 rend_t *r1 = line.r; 1448 rend_t *r1 = line.r;
1345 1449
1346 for (int j = ncol; j--; ) 1450 for (int j = ncol; j--; )
1347 *r1++ = fs; 1451 *r1++ = fs;
1348 1452
1349 line.l = ncol; /* make the `E's selectable */ 1453 line.is_longer (0);
1454 line.touch (ncol);
1350 } 1455 }
1351} 1456}
1352 1457
1353/* ------------------------------------------------------------------------- */ 1458/* ------------------------------------------------------------------------- */
1354/* 1459/*
1355 * Insert/Delete <count> lines 1460 * Insert/Delete <count> lines
1356 */ 1461 */
1357void 1462void
1358rxvt_term::scr_insdel_lines (int count, int insdel) 1463rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1359{ 1464{
1360 int end; 1465 int end;
1361 1466
1362 ZERO_SCROLLBACK (); 1467 ZERO_SCROLLBACK ();
1363 1468
… …
1383/* ------------------------------------------------------------------------- */ 1488/* ------------------------------------------------------------------------- */
1384/* 1489/*
1385 * Insert/Delete <count> characters from the current position 1490 * Insert/Delete <count> characters from the current position
1386 */ 1491 */
1387void 1492void
1388rxvt_term::scr_insdel_chars (int count, int insdel) 1493rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1389{ 1494{
1390 int col, row;
1391 rend_t tr;
1392
1393 want_refresh = 1; 1495 want_refresh = 1;
1394 ZERO_SCROLLBACK (); 1496 ZERO_SCROLLBACK ();
1395 1497
1396 if (count <= 0) 1498 if (count <= 0)
1397 return; 1499 return;
… …
1399 scr_do_wrap (); 1501 scr_do_wrap ();
1400 1502
1401 selection_check (1); 1503 selection_check (1);
1402 min_it (count, ncol - screen.cur.col); 1504 min_it (count, ncol - screen.cur.col);
1403 1505
1404 row = screen.cur.row; 1506 int row = screen.cur.row;
1405 1507
1406 line_t *line = &ROW(row); 1508 line_t *line = &ROW(row);
1407 1509
1510 line->touch ();
1511 line->is_longer (0);
1512
1513 // nuke wide spanning the start
1514 if (line->t[screen.cur.col] == NOCHAR)
1515 scr_kill_char (*line, screen.cur.col);
1516
1408 switch (insdel) 1517 switch (insdel)
1409 { 1518 {
1410 case INSERT: 1519 case INSERT:
1411 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1520 line->l = min (line->l + count, ncol);
1521
1522 if (line->t[screen.cur.col] == NOCHAR)
1523 scr_kill_char (*line, screen.cur.col);
1524
1525 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1412 { 1526 {
1413 line->t[col] = line->t[col - count]; 1527 line->t[col] = line->t[col - count];
1414 line->r[col] = line->r[col - count]; 1528 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 } 1529 }
1422 1530
1423 if (selection.op && current_screen == selection.screen 1531 if (selection.op && current_screen == selection.screen
1424 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1532 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1425 { 1533 {
1426 if (selection.end.row != screen.cur.row 1534 if (selection.end.row != screen.cur.row
1427 || (selection.end.col + count >= ncol)) 1535 || (selection.end.col + count >= ncol))
1428 CLEAR_SELECTION (); 1536 CLEAR_SELECTION ();
1429 else 1537 else
1538 {
1430 { /* shift selection */ 1539 /* shift selection */
1431 selection.beg.col += count; 1540 selection.beg.col += count;
1432 selection.mark.col += count; /* XXX: yes? */ 1541 selection.mark.col += count; /* XXX: yes? */
1433 selection.end.col += count; 1542 selection.end.col += count;
1434 } 1543 }
1435 } 1544 }
… …
1439 1548
1440 case ERASE: 1549 case ERASE:
1441 screen.cur.col += count; /* don't worry if > ncol */ 1550 screen.cur.col += count; /* don't worry if > ncol */
1442 selection_check (1); 1551 selection_check (1);
1443 screen.cur.col -= count; 1552 screen.cur.col -= count;
1553
1554 // nuke wide char after the end
1555 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1556 scr_kill_char (*line, screen.cur.col + count);
1557
1444 scr_blank_line (*line, screen.cur.col, count, rstyle); 1558 scr_blank_line (*line, screen.cur.col, count, rstyle);
1445 break; 1559 break;
1446 1560
1447 case DELETE: 1561 case DELETE:
1448 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1562 line->l = max (line->l - count, 0);
1449 1563
1564 // nuke wide char spanning the end
1565 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1566 scr_kill_char (*line, screen.cur.col + count);
1567
1450 for (col = screen.cur.col; (col + count) < ncol; col++) 1568 for (int col = screen.cur.col; (col + count) < ncol; col++)
1451 { 1569 {
1452 line->t[col] = line->t[col + count]; 1570 line->t[col] = line->t[col + count];
1453 line->r[col] = line->r[col + count]; 1571 line->r[col] = line->r[col + count];
1454 } 1572 }
1455 1573
1456 scr_blank_line (*line, ncol - count, count, tr); 1574 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 1575
1463 if (selection.op && current_screen == selection.screen 1576 if (selection.op && current_screen == selection.screen
1464 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1577 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1465 { 1578 {
1466 if (selection.end.row != screen.cur.row 1579 if (selection.end.row != screen.cur.row
… …
1483/* ------------------------------------------------------------------------- */ 1596/* ------------------------------------------------------------------------- */
1484/* 1597/*
1485 * Set the scrolling region 1598 * Set the scrolling region
1486 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1599 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1487 */ 1600 */
1488void 1601void ecb_cold
1489rxvt_term::scr_scroll_region (int top, int bot) 1602rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1490{ 1603{
1491 max_it (top, 0); 1604 max_it (top, 0);
1492 min_it (bot, nrow - 1); 1605 min_it (bot, nrow - 1);
1493 1606
1494 if (top > bot) 1607 if (top > bot)
… …
1503/* 1616/*
1504 * Make the cursor visible/invisible 1617 * Make the cursor visible/invisible
1505 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1618 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1506 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1619 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1507 */ 1620 */
1508void 1621void ecb_cold
1509rxvt_term::scr_cursor_visible (int mode) 1622rxvt_term::scr_cursor_visible (int mode) NOTHROW
1510{ 1623{
1511 want_refresh = 1; 1624 want_refresh = 1;
1512 1625
1513 if (mode) 1626 if (mode)
1514 screen.flags |= Screen_VisibleCursor; 1627 screen.flags |= Screen_VisibleCursor;
… …
1520/* 1633/*
1521 * Set/unset automatic wrapping 1634 * Set/unset automatic wrapping
1522 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1635 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1523 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1636 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1524 */ 1637 */
1525void 1638void ecb_cold
1526rxvt_term::scr_autowrap (int mode) 1639rxvt_term::scr_autowrap (int mode) NOTHROW
1527{ 1640{
1528 if (mode) 1641 if (mode)
1529 screen.flags |= Screen_Autowrap; 1642 screen.flags |= Screen_Autowrap;
1530 else 1643 else
1531 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1644 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1539 * Relative mode: line numbers are relative to top margin of scrolling region 1652 * Relative mode: line numbers are relative to top margin of scrolling region
1540 * and the cursor cannot be moved outside. 1653 * and the cursor cannot be moved outside.
1541 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1654 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1542 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1655 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1543 */ 1656 */
1544void 1657void ecb_cold
1545rxvt_term::scr_relative_origin (int mode) 1658rxvt_term::scr_relative_origin (int mode) NOTHROW
1546{ 1659{
1547 if (mode) 1660 if (mode)
1548 screen.flags |= Screen_Relative; 1661 screen.flags |= Screen_Relative;
1549 else 1662 else
1550 screen.flags &= ~Screen_Relative; 1663 screen.flags &= ~Screen_Relative;
… …
1556/* 1669/*
1557 * Set insert/replace mode 1670 * Set insert/replace mode
1558 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1671 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1559 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1672 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1560 */ 1673 */
1561void 1674void ecb_cold
1562rxvt_term::scr_insert_mode (int mode) 1675rxvt_term::scr_insert_mode (int mode) NOTHROW
1563{ 1676{
1564 if (mode) 1677 if (mode)
1565 screen.flags |= Screen_Insert; 1678 screen.flags |= Screen_Insert;
1566 else 1679 else
1567 screen.flags &= ~Screen_Insert; 1680 screen.flags &= ~Screen_Insert;
… …
1572 * Set/Unset tabs 1685 * Set/Unset tabs
1573 * XTERM_SEQ: Set tab at current column : ESC H 1686 * XTERM_SEQ: Set tab at current column : ESC H
1574 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1687 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1575 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1688 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1576 */ 1689 */
1577void 1690void ecb_cold
1578rxvt_term::scr_set_tab (int mode) 1691rxvt_term::scr_set_tab (int mode) NOTHROW
1579{ 1692{
1580 if (mode < 0) 1693 if (mode < 0)
1581 memset (tabs, 0, ncol * sizeof (char)); 1694 memset (tabs, 0, ncol);
1582 else if (screen.cur.col < ncol) 1695 else if (screen.cur.col < ncol)
1583 tabs[screen.cur.col] = (mode ? 1 : 0); 1696 tabs [screen.cur.col] = !!mode;
1584} 1697}
1585 1698
1586/* ------------------------------------------------------------------------- */ 1699/* ------------------------------------------------------------------------- */
1587/* 1700/*
1588 * Set reverse/normal video 1701 * Set reverse/normal video
1589 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1702 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1590 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1703 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1591 */ 1704 */
1592void 1705void
1593rxvt_term::scr_rvideo_mode (int mode) 1706rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1594{ 1707{
1595 XGCValues gcvalue; 1708 rvideo_mode = on;
1596 1709
1710#ifndef NO_BELL
1711 on ^= rvideo_bell;
1712#endif
1713
1597 if (rvideo != mode) 1714 if (rvideo_state != on)
1598 { 1715 {
1599 rvideo = mode; 1716 rvideo_state = on;
1717
1600 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1718 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1601#if XPM_BACKGROUND 1719#ifdef HAVE_IMG
1602 if (bgPixmap.pixmap == None) 1720 if (bg_img == 0)
1603#endif 1721#endif
1604#if TRANSPARENT 1722 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 1723
1724 XGCValues gcvalue;
1610 gcvalue.foreground = pix_colors[Color_fg]; 1725 gcvalue.foreground = pix_colors[Color_fg];
1611 gcvalue.background = pix_colors[Color_bg]; 1726 gcvalue.background = pix_colors[Color_bg];
1612 XChangeGC (display->display, gc, GCBackground | GCForeground, 1727 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1613 &gcvalue); 1728
1614 scr_clear (); 1729 scr_clear ();
1615 scr_touch (true); 1730 scr_touch (true);
1616 } 1731 }
1617} 1732}
1618 1733
1619/* ------------------------------------------------------------------------- */ 1734/* ------------------------------------------------------------------------- */
1620/* 1735/*
1621 * Report current cursor position 1736 * Report current cursor position
1622 * XTERM_SEQ: Report position: ESC [ 6 n 1737 * XTERM_SEQ: Report position: ESC [ 6 n
1623 */ 1738 */
1624void 1739void ecb_cold
1625rxvt_term::scr_report_position () 1740rxvt_term::scr_report_position () NOTHROW
1626{ 1741{
1627 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1742 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1628} 1743}
1629 1744
1630/* ------------------------------------------------------------------------- * 1745/* ------------------------------------------------------------------------- *
… …
1632 * ------------------------------------------------------------------------- */ 1747 * ------------------------------------------------------------------------- */
1633 1748
1634/* 1749/*
1635 * Set font style 1750 * Set font style
1636 */ 1751 */
1637void 1752void ecb_cold
1638rxvt_term::set_font_style () 1753rxvt_term::set_font_style () NOTHROW
1639{ 1754{
1755#if 0
1640 switch (charsets[screen.charset]) 1756 switch (charsets [screen.charset])
1641 { 1757 {
1642 case '0': /* DEC Special Character & Line Drawing Set */ 1758 case '0': /* DEC Special Character & Line Drawing Set */
1643 break; 1759 break;
1644 case 'A': /* United Kingdom (UK) */ 1760 case 'A': /* United Kingdom (UK) */
1645 break; 1761 break;
… …
1652 case 'C': /* Finnish character set */ 1768 case 'C': /* Finnish character set */
1653 break; 1769 break;
1654 case 'K': /* German character set */ 1770 case 'K': /* German character set */
1655 break; 1771 break;
1656 } 1772 }
1773#endif
1657} 1774}
1658 1775
1659/* ------------------------------------------------------------------------- */ 1776/* ------------------------------------------------------------------------- */
1660/* 1777/*
1661 * Choose a font 1778 * Choose a font
1662 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1779 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1663 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1780 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1664 * XTERM_SEQ: Invoke G2 character set: ESC N 1781 * XTERM_SEQ: Invoke G2 character set: ESC N
1665 * XTERM_SEQ: Invoke G3 character set: ESC O 1782 * XTERM_SEQ: Invoke G3 character set: ESC O
1666 */ 1783 */
1667void 1784void ecb_cold
1668rxvt_term::scr_charset_choose (int set) 1785rxvt_term::scr_charset_choose (int set) NOTHROW
1669{ 1786{
1670 screen.charset = set; 1787 screen.charset = set;
1671 set_font_style (); 1788 set_font_style ();
1672} 1789}
1673 1790
… …
1679 * XTERM_SEQ: Set G2 character set: ESC * <C> 1796 * XTERM_SEQ: Set G2 character set: ESC * <C>
1680 * XTERM_SEQ: Set G3 character set: ESC + <C> 1797 * XTERM_SEQ: Set G3 character set: ESC + <C>
1681 * See set_font_style for possible values for <C> 1798 * See set_font_style for possible values for <C>
1682 */ 1799 */
1683void 1800void
1684rxvt_term::scr_charset_set (int set, unsigned int ch) 1801rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1685{ 1802{
1686 charsets[set] = (unsigned char)ch; 1803 charsets[set] = (unsigned char)ch;
1687 set_font_style (); 1804 set_font_style ();
1688} 1805}
1689 1806
… …
1693 * ------------------------------------------------------------------------- */ 1810 * ------------------------------------------------------------------------- */
1694 1811
1695/* 1812/*
1696 * refresh matching text. 1813 * refresh matching text.
1697 */ 1814 */
1698bool 1815bool ecb_cold
1699rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1816rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1700{ 1817{
1701 bool found = false; 1818 bool found = false;
1702 1819
1703 for (int i = 0; i < nrow; i++) 1820 for (int i = 0; i < nrow; i++)
1704 { 1821 {
1705 int col = 0;
1706 rend_t *drp = drawn_buf[i].r; 1822 rend_t *drp = drawn_buf[i].r;
1707 1823
1708 for (; col < ncol; col++, drp++) 1824 for (int col = 0; col < ncol; col++, drp++)
1709 if ((*drp & mask) == value) 1825 if ((*drp & mask) == value)
1710 { 1826 {
1711 found = true; 1827 found = true;
1712 *drp = ~value; 1828 *drp = ~value;
1713 } 1829 }
… …
1723 PART_BEG = 0, 1839 PART_BEG = 0,
1724 PART_END, 1840 PART_END,
1725 RC_COUNT 1841 RC_COUNT
1726}; 1842};
1727 1843
1728void 1844void ecb_hot
1729rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1845rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1730{ 1846{
1731 int i; 1847 int i;
1732 row_col_t rc[RC_COUNT]; 1848 row_col_t rc[RC_COUNT];
1733 1849
1734 if (!drawn_buf) /* sanity check */ 1850 if (!drawn_buf) /* sanity check */
… …
1757 } 1873 }
1758 1874
1759 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1875 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); 1876 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1761 1877
1878 num_scr_allow = 0;
1879
1762 if (refresh) 1880 if (refresh)
1763 scr_refresh (SLOW_REFRESH); 1881 scr_refresh ();
1764} 1882}
1765 1883
1766/* ------------------------------------------------------------------------- */ 1884/* ------------------------------------------------------------------------- */
1767/* 1885/*
1768 * Refresh the entire screen 1886 * Refresh the entire screen
1769 */ 1887 */
1770void 1888void
1771rxvt_term::scr_touch (bool refresh) 1889rxvt_term::scr_touch (bool refresh) NOTHROW
1772{ 1890{
1773 scr_expose (0, 0, width, height, refresh); 1891 scr_expose (0, 0, vt_width, vt_height, refresh);
1774} 1892}
1775 1893
1776/* ------------------------------------------------------------------------- */ 1894/* ------------------------------------------------------------------------- */
1777/* 1895/*
1778 * Move the display so that the line represented by scrollbar value Y is at 1896 * Move the display so that the line represented by scrollbar value Y is at
1779 * the top of the screen 1897 * the top of the screen
1780 */ 1898 */
1781int 1899void
1782rxvt_term::scr_move_to (int y, int len) 1900rxvt_term::scr_move_to (int y, int len) NOTHROW
1783{ 1901{
1784 long p = 0; 1902 // lerp (y, 0, len, top_row, nrow - 1)
1785 unsigned int oldviewstart; 1903 scr_changeview (top_row + (nrow - 1 - top_row) * y / len);
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} 1904}
1800 1905
1801/* ------------------------------------------------------------------------- */ 1906/* ------------------------------------------------------------------------- */
1802/* 1907/*
1803 * Page the screen up/down nlines 1908 * Page the screen up/down nlines
1804 * direction should be UP or DN 1909 * direction should be UP or DN
1805 */ 1910 */
1806int 1911bool
1807rxvt_term::scr_page (enum page_dirn direction, int nlines) 1912rxvt_term::scr_page (int nlines) NOTHROW
1808{ 1913{
1809 int n; 1914 return scr_changeview (view_start - nlines);
1810 unsigned int oldviewstart; 1915}
1811 1916
1917bool
1918rxvt_term::scr_changeview (int new_view_start) NOTHROW
1919{
1920 clamp_it (new_view_start, top_row, 0);
1921
1922 if (new_view_start == view_start)
1923 return false;
1924
1925 num_scr += new_view_start - view_start;
1812 oldviewstart = view_start; 1926 view_start = new_view_start;
1927 want_refresh = 1;
1813 1928
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;
1822 view_start = max (n, 0);
1823 }
1824
1825 return scr_changeview (oldviewstart);
1826}
1827
1828int
1829rxvt_term::scr_changeview (unsigned int oldviewstart)
1830{
1831 PERL_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1929 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1832 1930
1833 if (view_start != oldviewstart) 1931 return true;
1834 {
1835 want_refresh = 1;
1836 num_scr -= (view_start - oldviewstart);
1837 }
1838
1839 return (int) (view_start - oldviewstart);
1840} 1932}
1841 1933
1842/* ------------------------------------------------------------------------- */ 1934#ifndef NO_BELL
1843void 1935void
1936rxvt_term::bell_cb (ev::timer &w, int revents)
1937{
1938 rvideo_bell = false;
1939 scr_rvideo_mode (rvideo_mode);
1940 refresh_check ();
1941}
1942#endif
1943
1944/* ------------------------------------------------------------------------- */
1945void
1844rxvt_term::scr_bell () 1946rxvt_term::scr_bell () NOTHROW
1845{ 1947{
1846#ifndef NO_BELL 1948#ifndef NO_BELL
1847 1949
1848# ifndef NO_MAPALERT 1950# ifndef NO_MAPALERT
1849# ifdef MAPALERT_OPTION 1951# ifdef MAPALERT_OPTION
1850 if (OPTION (Opt_mapAlert)) 1952 if (option (Opt_mapAlert))
1851# endif 1953# endif
1852 XMapWindow (display->display, parent[0]); 1954 XMapWindow (dpy, parent);
1853# endif 1955# endif
1854 1956
1957# if ENABLE_FRILLS
1958 if (option (Opt_urgentOnBell))
1959 set_urgency (1);
1960# endif
1961
1855 if (OPTION (Opt_visualBell)) 1962 if (option (Opt_visualBell))
1856 { 1963 {
1857 scr_rvideo_mode (!rvideo); /* refresh also done */ 1964 rvideo_bell = true;
1965 scr_rvideo_mode (rvideo_mode);
1966 flush ();
1967
1858 rxvt_usleep (VISUAL_BELL_DURATION); 1968 bell_ev.start (VISUAL_BELL_DURATION);
1859 scr_rvideo_mode (!rvideo); /* refresh also done */
1860 } 1969 }
1861 else 1970 else
1862 XBell (display->display, 0); 1971 XBell (dpy, 0);
1863 1972 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1864#endif 1973#endif
1865} 1974}
1866 1975
1867/* ------------------------------------------------------------------------- */ 1976/* ------------------------------------------------------------------------- */
1868/* ARGSUSED */ 1977void ecb_cold
1869void
1870rxvt_term::scr_printscreen (int fullhist) 1978rxvt_term::scr_printscreen (int fullhist) NOTHROW
1871{ 1979{
1872#ifdef PRINTPIPE 1980#ifdef PRINTPIPE
1873 int nrows, row_start; 1981 int nrows, row_start;
1874 FILE *fd; 1982 FILE *fd = popen_printer ();
1875 1983
1876 if ((fd = popen_printer ()) == NULL) 1984 if (!fd)
1877 return; 1985 return;
1878 1986
1879 if (fullhist) 1987 if (fullhist)
1880 { 1988 {
1881 nrows = nrow + nsaved; 1989 nrows = nrow - top_row;
1882 row_start = -nsaved; 1990 row_start = top_row;
1883 } 1991 }
1884 else 1992 else
1885 { 1993 {
1886 nrows = nrow; 1994 nrows = nrow;
1887 row_start = -view_start; 1995 row_start = view_start;
1888 } 1996 }
1889 1997
1890 wctomb (0, 0); 1998 wctomb (0, 0);
1891 1999
1892 for (int r1 = 0; r1 < nrows; r1++) 2000 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1893 { 2001 {
1894 text_t *tp = ROW(r1).t; 2002 text_t *tp = ROW(r1).t;
1895 int len = ROW(r1).l; 2003 int len = ROW(r1).l;
1896 2004
1897 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 2005 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1923/* 2031/*
1924 * Refresh the screen 2032 * Refresh the screen
1925 * drawn_text/drawn_rend contain the screen information before the update. 2033 * drawn_text/drawn_rend contain the screen information before the update.
1926 * screen.text/screen.rend contain what the screen will change to. 2034 * screen.text/screen.rend contain what the screen will change to.
1927 */ 2035 */
1928void 2036void ecb_hot
1929rxvt_term::scr_refresh (unsigned char refresh_type) 2037rxvt_term::scr_refresh () NOTHROW
1930{ 2038{
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 */ 2039 int16_t col, row, /* column/row we're processing */
1934 ocrow; /* old cursor row */ 2040 ocrow; /* old cursor row */
1935 int i; /* tmp */ 2041 int i; /* tmp */
1936#ifndef NO_CURSORCOLOR 2042 rend_t ccol1, /* Cursor colour */
1937 rend_t cc1; /* store colours at cursor position (s) */ 2043 ccol2; /* Cursor colour2 */
1938#endif 2044 rend_t cur_rend;
1939 rend_t *crp; // cursor rendition pointer 2045 int cur_col;
2046 int cursorwidth;
1940 2047
1941 want_refresh = 0; /* screen is current */ 2048 want_refresh = 0; /* screen is current */
1942 2049
1943 if (refresh_type == NO_REFRESH || !mapped) 2050 if (refresh_type == NO_REFRESH || !mapped)
1944 return; 2051 return;
1945 2052
1946 /* 2053 /*
1947 * A: set up vars 2054 * A: set up vars
1948 */ 2055 */
1949 must_clear = 0;
1950 refresh_count = 0; 2056 refresh_count = 0;
1951 2057
1952#if XPM_BACKGROUND 2058 unsigned int old_screen_flags = screen.flags;
1953 must_clear |= bgPixmap.pixmap != None; 2059 bool have_bg = 0;
1954#endif 2060#ifdef HAVE_IMG
1955#if TRANSPARENT 2061 have_bg = bg_img != 0;
1956 must_clear |= OPTION (Opt_transparent) && am_transparent;
1957#endif 2062#endif
1958 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2063 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1959 2064
1960 /* 2065 /*
1961 * B: reverse any characters which are selected 2066 * B: reverse any characters which are selected
1962 */ 2067 */
1963 scr_reverse_selection (); 2068 scr_reverse_selection ();
1964 2069
2070 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2071#if ENABLE_OVERLAY
2072 scr_swap_overlay ();
2073#endif
2074
2075 bool showcursor = screen.flags & Screen_VisibleCursor;
2076
1965 /* 2077 /*
1966 * C: set the cursor character (s) 2078 * C: set the cursor character (s)
1967 */ 2079 */
1968 { 2080 {
1969 unsigned char setoldcursor;
1970 rend_t ccol1, /* Cursor colour */
1971 ccol2; /* Cursor colour2 */
1972
1973 showcursor = (screen.flags & Screen_VisibleCursor);
1974#ifdef CURSOR_BLINK 2081#ifdef CURSOR_BLINK
1975 if (hidden_cursor) 2082 if (hidden_cursor)
1976 showcursor = 0; 2083 showcursor = 0;
1977#endif 2084#endif
1978 2085
… …
1981 int col = screen.cur.col; 2088 int col = screen.cur.col;
1982 2089
1983 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2090 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
1984 col--; 2091 col--;
1985 2092
2093 cursorwidth = 1;
2094 while (col + cursorwidth < ncol
2095 && ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
2096 cursorwidth++;
2097
1986 crp = &ROW(screen.cur.row).r[col]; 2098 cur_rend = ROW(screen.cur.row).r[col];
2099 cur_col = col;
1987 2100
1988 if (showcursor && focus) 2101#ifndef NO_CURSORCOLOR
2102 if (ISSET_PIXCOLOR (Color_cursor))
2103 ccol1 = Color_cursor;
2104 else
2105#endif
2106#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2107 ccol1 = fgcolor_of (rstyle);
2108#else
2109 ccol1 = Color_fg;
2110#endif
2111
2112#ifndef NO_CURSORCOLOR
2113 if (ISSET_PIXCOLOR (Color_cursor2))
2114 ccol2 = Color_cursor2;
2115 else
2116#endif
2117#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2118 ccol2 = bgcolor_of (rstyle);
2119#else
2120 ccol2 = Color_bg;
2121#endif
2122
2123 if (focus)
1989 { 2124 {
2125 rend_t rend = cur_rend;
2126
1990 if (OPTION (Opt_cursorUnderline)) 2127 if (option (Opt_cursorUnderline))
1991 *crp ^= RS_Uline; 2128 rend ^= RS_Uline;
1992 else 2129 else
1993 { 2130 {
1994 *crp ^= RS_RVid; 2131 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); 2132 rend = SET_FGCOLOR (rend, ccol1);
2015 *crp = SET_BGCOLOR (*crp, ccol2); 2133 rend = SET_BGCOLOR (rend, ccol2);
2016#endif
2017 } 2134 }
2135
2136 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2018 } 2137 }
2019 } 2138 }
2020 2139
2021 /* make sure no outline cursor is left around */ 2140 /* make sure no outline cursor is left around */
2022 setoldcursor = 0;
2023 if (ocrow != -1) 2141 if (ocrow != -1)
2024 { 2142 {
2025 if (screen.cur.row + view_start != ocrow 2143 if (screen.cur.row - view_start != ocrow
2026 || screen.cur.col != oldcursor.col) 2144 || screen.cur.col != oldcursor.col)
2027 { 2145 {
2028 if (ocrow < nrow 2146 if (ocrow < nrow
2029 && oldcursor.col < ncol) 2147 && oldcursor.col < ncol)
2030 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2148 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2031
2032 if (focus || !showcursor)
2033 oldcursor.row = -1;
2034 else
2035 setoldcursor = 1;
2036 } 2149 }
2037 } 2150 }
2038 else if (!focus)
2039 setoldcursor = 1;
2040 2151
2041 if (setoldcursor) 2152 // save the current cursor coordinates if the cursor is visible
2153 // and the window is unfocused, so as to clear the outline cursor
2154 // in the next refresh if the cursor moves
2155 if (showcursor && !focus && screen.cur.row - view_start < nrow)
2042 { 2156 {
2043 if (screen.cur.row + view_start >= nrow)
2044 oldcursor.row = -1;
2045 else
2046 {
2047 oldcursor.row = screen.cur.row + view_start; 2157 oldcursor.row = screen.cur.row - view_start;
2048 oldcursor.col = screen.cur.col; 2158 oldcursor.col = screen.cur.col;
2049 }
2050 } 2159 }
2160 else
2161 oldcursor.row = -1;
2051 } 2162 }
2052
2053 PERL_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2054#if ENABLE_OVERLAY
2055 scr_swap_overlay ();
2056#endif
2057 2163
2058#ifndef NO_SLOW_LINK_SUPPORT 2164#ifndef NO_SLOW_LINK_SUPPORT
2059 /* 2165 /*
2060 * D: CopyArea pass - very useful for slower links 2166 * D: CopyArea pass - very useful for slower links
2061 * This has been deliberately kept simple. 2167 * This has been deliberately kept simple.
2062 */ 2168 */
2063 i = num_scr;
2064 if (!display->is_local 2169 if (!display->is_local
2065 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2170 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2066 && abs (num_scr) < nrow && !must_clear) 2171 && abs (num_scr) < nrow && !have_bg)
2067 { 2172 {
2068 int16_t nits; 2173 int16_t nits;
2174 int i = num_scr;
2069 int j; 2175 int j;
2070 int len, wlen; 2176 int len, wlen;
2071 2177
2072 j = nrow; 2178 j = nrow;
2073 wlen = len = -1; 2179 wlen = len = -1;
2074 row = i > 0 ? 0 : j - 1; 2180 row = i > 0 ? 0 : j - 1;
2181
2075 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2182 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2076 { 2183 {
2077 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2184 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2078 { 2185 {
2079 line_t s = ROW(row - view_start); 2186 line_t s = ROW(view_start + row);
2080 line_t d = drawn_buf[row]; 2187 line_t d = drawn_buf[row];
2081 line_t d2 = drawn_buf[row + i]; 2188 line_t d2 = drawn_buf[row + i];
2082 2189
2083 for (nits = 0, col = ncol; col--; ) 2190 for (nits = 0, col = ncol; col--; )
2084 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2191 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
… …
2100 wlen = row; 2207 wlen = row;
2101 continue; 2208 continue;
2102 } 2209 }
2103 } 2210 }
2104 2211
2105 if (len != -1) 2212 if (len >= 0)
2106 { 2213 {
2107 /* also comes here at end if needed because of >= above */ 2214 /* also comes here at end if needed because of >= above */
2108 if (wlen < len) 2215 if (wlen < len)
2109 ::swap (wlen, len); 2216 ::swap (wlen, len);
2110 2217
2218 XGCValues gcv;
2219
2220 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2111 XCopyArea (display->display, vt, vt, 2221 XCopyArea (dpy, vt, vt,
2112 gc, 0, Row2Pixel (len + i), 2222 gc, 0, Row2Pixel (len + i),
2113 (unsigned int)this->width, 2223 (unsigned int)this->width,
2114 (unsigned int)Height2Pixel (wlen - len + 1), 2224 (unsigned int)Height2Pixel (wlen - len + 1),
2115 0, Row2Pixel (len)); 2225 0, Row2Pixel (len));
2226 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2227
2116 len = -1; 2228 len = -1;
2117 } 2229 }
2118 } 2230 }
2119 } 2231 }
2120#endif 2232#endif
… …
2122 /* 2234 /*
2123 * E: main pass across every character 2235 * E: main pass across every character
2124 */ 2236 */
2125 for (row = 0; row < nrow; row++) 2237 for (row = 0; row < nrow; row++)
2126 { 2238 {
2127 text_t *stp = ROW(row - view_start).t; 2239 text_t *stp = ROW(view_start + row).t;
2128 rend_t *srp = ROW(row - view_start).r; 2240 rend_t *srp = ROW(view_start + row).r;
2129 text_t *dtp = drawn_buf[row].t; 2241 text_t *dtp = drawn_buf[row].t;
2130 rend_t *drp = drawn_buf[row].r; 2242 rend_t *drp = drawn_buf[row].r;
2131 2243
2132 /* 2244 /*
2133 * E2: OK, now the real pass 2245 * E2: OK, now the real pass
… …
2144 continue; 2256 continue;
2145 2257
2146 // redraw one or more characters 2258 // redraw one or more characters
2147 2259
2148 // seek to the beginning of wide characters 2260 // seek to the beginning of wide characters
2149 while (stp[col] == NOCHAR && col > 0) 2261 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2150 --col; 2262 --col;
2151 2263
2152 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2264 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2153 text_t *text = stp + col; 2265 text_t *text = stp + col;
2154 int count = 1; 2266 int count = 1;
2155 2267
2156 dtp[col] = stp[col]; 2268 dtp[col] = stp[col];
2157 drp[col] = rend; 2269 drp[col] = rend;
… …
2161 for (i = 0; ++col < ncol; ) 2273 for (i = 0; ++col < ncol; )
2162 { 2274 {
2163 if (stp[col] == NOCHAR) 2275 if (stp[col] == NOCHAR)
2164 { 2276 {
2165 dtp[col] = stp[col]; 2277 dtp[col] = stp[col];
2166 drp[col] = rend; 2278 drp[col] = srp[col];
2279
2167 count++; 2280 count++;
2168 i++; 2281 i++;
2169 2282
2170 continue; 2283 continue;
2171 } 2284 }
… …
2176 count++; 2289 count++;
2177 2290
2178 if (stp[col] != dtp[col] 2291 if (stp[col] != dtp[col]
2179 || !RS_SAME (srp[col], drp[col])) 2292 || !RS_SAME (srp[col], drp[col]))
2180 { 2293 {
2181 if (must_clear && (i++ > count / 2)) 2294 if (have_bg && (i++ > count / 2))
2182 break; 2295 break;
2183 2296
2184 dtp[col] = stp[col]; 2297 dtp[col] = stp[col];
2185 drp[col] = rend; 2298 drp[col] = rend;
2186 i = 0; 2299 i = 0;
2187 } 2300 }
2188 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2301 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2189 break; 2302 break;
2190 } 2303 }
2191 2304
2192 col--; /* went one too far. move back */ 2305 col--; /* went one too far. move back */
2193 count -= i; /* dump any matching trailing chars */ 2306 count -= i; /* dump any matching trailing chars */
2194 2307
2195 // sometimes we optimize away the trailing NOCHAR's, add them back 2308 // sometimes we optimize away the trailing NOCHAR's, add them back
2196 while (i && text[count] == NOCHAR) 2309 while (ecb_unlikely (i && text[count] == NOCHAR))
2197 count++, i--; 2310 count++, i--;
2198 2311
2199 /* 2312 /*
2200 * Determine the attributes for the string 2313 * Determine the attributes for the string
2201 */ 2314 */
2202 int fore = fgcolor_of (rend); // desired foreground 2315 int fore = fgcolor_of (rend); // desired foreground
2203 int back = bgcolor_of (rend); // desired background 2316 int back = bgcolor_of (rend); // desired background
2204 2317
2205 // only do special processing if any attributes are set, which is unlikely 2318 // 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)) 2319 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2207 { 2320 {
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; 2321 bool invert = rend & RS_RVid;
2221 2322
2222#ifndef NO_BOLD_UNDERLINE_REVERSE 2323#ifndef NO_BOLD_UNDERLINE_REVERSE
2223 if (rend & RS_Bold
2224 && fore == Color_fg) 2324 if (rend & RS_Bold && fore == Color_fg)
2225 { 2325 {
2226 if (ISSET_PIXCOLOR (Color_BD)) 2326 if (ISSET_PIXCOLOR (Color_BD))
2227 fore = Color_BD; 2327 fore = Color_BD;
2228# if !ENABLE_STYLES 2328# if !ENABLE_STYLES
2229 else 2329 else
2230 invert = !invert; 2330 invert = !invert;
2231# endif 2331# endif
2232 } 2332 }
2233 2333
2234 if (rend & RS_Italic 2334 if (rend & RS_Italic && fore == Color_fg)
2235 && fore == Color_fg)
2236 { 2335 {
2237 if (ISSET_PIXCOLOR (Color_IT)) 2336 if (ISSET_PIXCOLOR (Color_IT))
2238 fore = Color_IT; 2337 fore = Color_IT;
2239# if !ENABLE_STYLES 2338# if !ENABLE_STYLES
2240 else 2339 else
2241 invert = !invert; 2340 invert = !invert;
2242# endif 2341# endif
2243 } 2342 }
2244 2343
2245 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2344 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2246 fore = Color_UL; 2345 fore = Color_UL;
2346#endif
2347
2348#ifdef OPTION_HC
2349 if (rend & RS_Sel)
2350 {
2351 /* invert the column if no highlightColor is set or it is the
2352 * current cursor column */
2353 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2354 && ISSET_PIXCOLOR (Color_HC))
2355 {
2356 if (ISSET_PIXCOLOR (Color_HTC))
2357 fore = Color_HTC;
2358 // if invert is 0 reverse video is set so we use bg color as fg color
2359 else if (!invert)
2360 fore = back;
2361
2362 back = Color_HC;
2363 invert = 0;
2364 }
2365 }
2247#endif 2366#endif
2248 2367
2249 if (invert) 2368 if (invert)
2250 { 2369 {
2251 ::swap (fore, back); 2370 ::swap (fore, back);
2252 2371
2253#ifndef NO_BOLD_UNDERLINE_REVERSE 2372#ifndef NO_BOLD_UNDERLINE_REVERSE
2254 if (ISSET_PIXCOLOR (Color_RV))
2255 back = Color_RV;
2256
2257 if (fore == back) 2373 if (fore == back)
2258 { 2374 {
2259 fore = Color_bg; 2375 fore = Color_bg;
2260 back = Color_fg; 2376 back = Color_fg;
2261 } 2377 }
… …
2263 } 2379 }
2264 2380
2265#ifdef TEXT_BLINK 2381#ifdef TEXT_BLINK
2266 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2382 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2267 { 2383 {
2268 if (!text_blink_ev.active) 2384 if (!text_blink_ev.is_active ())
2269 { 2385 {
2270 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2386 text_blink_ev.again ();
2271 hidden_text = 0; 2387 hidden_text = 0;
2272 } 2388 }
2273 else if (hidden_text) 2389 else if (hidden_text)
2274 fore = back; 2390 fore = back;
2275 } 2391 }
2276#endif 2392#endif
2393
2394#if ENABLE_STYLES
2395 // "careful" (too wide) character handling
2396
2397 // include previous careful character(s) if possible, looks nicer (best effort...)
2398 while (text > stp
2399 && srp[text - stp - 1] & RS_Careful
2400 && RS_SAME (rend, srp[text - stp - 1]))
2401 text--, count++, xpixel -= fwidth;
2402
2403 // force redraw after "careful" characters to avoid pixel droppings
2404 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2405 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2406
2407 // force redraw before "careful" characters to avoid pixel droppings
2408 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2409 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2410#endif
2277 } 2411 }
2278 2412
2279 /* 2413 /*
2280 * Actually do the drawing of the string here 2414 * Actually do the drawing of the string here
2281 */ 2415 */
2282 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2416 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2283 2417
2284 if (back == fore) 2418 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 { 2419 {
2290 if (must_clear) 2420 // this is very ugly, maybe push it into ->draw?
2291 {
2292 CLEAR_CHARS (xpixel, ypixel, count);
2293 2421
2294 for (i = 0; i < count; i++) /* don't draw empty strings */ 2422 for (i = 0; i < count; i++) /* don't draw empty strings */
2295 if (text[i] != ' ') 2423 if (text[i] != ' ')
2296 { 2424 {
2297 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2425 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2298 break; 2426 goto did_clear;
2299 }
2300 } 2427 }
2301 else 2428
2302 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2429 CLEAR_CHARS (xpixel, ypixel, count);
2430 did_clear: ;
2303 } 2431 }
2304 else 2432 else
2305 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2433 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2306 2434
2307 if (rend & RS_Uline && font->descent > 1 && fore != back) 2435 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2308 { 2436 {
2437 if (showcursor && focus && row == screen.cur.row
2438 && IN_RANGE_EXC (col, cur_col, cur_col + cursorwidth))
2439 XSetForeground (dpy, gc, pix_colors[ccol1]);
2440 else
2309#if ENABLE_FRILLS 2441#if ENABLE_FRILLS
2310 if (ISSET_PIXCOLOR (Color_underline)) 2442 if (ISSET_PIXCOLOR (Color_underline))
2311 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2443 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2312 else 2444 else
2313#endif 2445#endif
2314 XSetForeground (display->display, gc, pix_colors[fore]); 2446 XSetForeground (dpy, gc, pix_colors[fore]);
2315 2447
2316 XDrawLine (display->display, drawBuffer, gc, 2448 XDrawLine (dpy, vt, gc,
2317 xpixel, ypixel + font->ascent + 1, 2449 xpixel, ypixel + font->ascent + 1,
2318 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2450 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2319 } 2451 }
2320 } /* for (col....) */ 2452 } /* for (col....) */
2321 } /* for (row....) */ 2453 } /* for (row....) */
2322 2454
2323#if ENABLE_OVERLAY
2324 scr_swap_overlay ();
2325#endif
2326 PERL_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2327
2328 /* 2455 /*
2329 * G: cleanup cursor and display outline cursor if necessary 2456 * G: cleanup cursor and display outline cursor if necessary
2330 */ 2457 */
2331 if (showcursor) 2458 if (showcursor)
2332 { 2459 {
2333 if (focus) 2460 if (focus)
2334 { 2461 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) 2462 else if (oldcursor.row >= 0)
2346 { 2463 {
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]); 2464 XSetForeground (dpy, gc, pix_colors[ccol1]);
2360#endif
2361 2465
2362 XDrawRectangle (display->display, drawBuffer, gc, 2466 XDrawRectangle (dpy, vt, gc,
2363 Col2Pixel (col), 2467 Col2Pixel (cur_col),
2364 Row2Pixel (oldcursor.row), 2468 Row2Pixel (oldcursor.row),
2365 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2469 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2366 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2470 (unsigned int) (Height2Pixel (1) - 1));
2367 } 2471 }
2368 } 2472 }
2369 2473
2370 /* 2474 /*
2371 * H: cleanup selection 2475 * H: cleanup selection
2372 */ 2476 */
2477#if ENABLE_OVERLAY
2478 scr_swap_overlay ();
2479#endif
2480 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2481
2373 scr_reverse_selection (); 2482 scr_reverse_selection ();
2374 2483
2375 if (refresh_type & SMOOTH_REFRESH) 2484 screen.flags = old_screen_flags;
2376 XFlush (display->display);
2377
2378 num_scr = 0; 2485 num_scr = 0;
2379 num_scr_allow = 1; 2486 num_scr_allow = 1;
2380} 2487}
2381 2488
2382void 2489void ecb_cold
2383rxvt_term::scr_remap_chars (const line_t &l) 2490rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2384{ 2491{
2385 if (!l.t) 2492 if (!l.valid ())
2386 return; 2493 return;
2494
2495 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2387 2496
2388 for (int i = ncol; i--; ) 2497 for (int i = ncol; i--; )
2389 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2498 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2390} 2499}
2391 2500
2392void 2501void ecb_cold
2393rxvt_term::scr_remap_chars () 2502rxvt_term::scr_remap_chars () NOTHROW
2394{ 2503{
2395 for (int i = total_rows; i--; ) 2504 for (int i = total_rows; i--; )
2396 scr_remap_chars (row_buf [i]); 2505 scr_remap_chars (row_buf [i]);
2397 2506
2398 for (int i = nrow; i--; ) 2507 for (int i = nrow; i--; )
… …
2400 scr_remap_chars (drawn_buf [i]); 2509 scr_remap_chars (drawn_buf [i]);
2401 scr_remap_chars (swap_buf [i]); 2510 scr_remap_chars (swap_buf [i]);
2402 } 2511 }
2403} 2512}
2404 2513
2405void 2514void ecb_cold
2406rxvt_term::scr_recolour () 2515rxvt_term::scr_recolour (bool refresh) NOTHROW
2407{ 2516{
2408 if (1 2517 bool transparent = false;
2409#if TRANSPARENT 2518
2410 && !am_transparent 2519#ifdef HAVE_IMG
2520 if (bg_img != 0)
2521 {
2522# if ENABLE_TRANSPARENCY
2523 if (bg_flags & BG_IS_TRANSPARENT)
2524 {
2525 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2526 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2527
2528 transparent = true;
2529 }
2530 else
2411#endif 2531# endif
2412#if XPM_BACKGROUND
2413 && !bgPixmap.pixmap
2414#endif
2415 ) 2532 {
2533 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2534 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2535 }
2416 { 2536 }
2537 else
2538#endif
2539 {
2417 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2540 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2418 XClearWindow (display->display, parent[0]);
2419 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2541 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2420#if HAVE_SCROLLBARS 2542 }
2543
2544 XClearWindow (dpy, parent);
2545
2421 if (scrollBar.win) 2546 if (scrollBar.win)
2422 { 2547 {
2548 if (transparent)
2549 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2550 else
2423 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2551 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2424 scrollBar.setIdle (); 2552 scrollBar.state = SB_STATE_IDLE;
2425 scrollbar_show (0); 2553 scrollBar.show (0);
2426 } 2554 }
2427#endif 2555
2556 if (refresh)
2428 } 2557 {
2429
2430 scr_clear (); 2558 scr_clear ();
2431 scr_touch (true); 2559 scr_touch (true);
2560 }
2432 want_refresh = 1; 2561 want_refresh = 1;
2433} 2562}
2434 2563
2435/* ------------------------------------------------------------------------- */ 2564/* ------------------------------------------------------------------------- */
2436void 2565void
2437rxvt_term::scr_clear (bool really) 2566rxvt_term::scr_clear (bool really) NOTHROW
2438{ 2567{
2439 if (!mapped) 2568 if (!mapped)
2440 return; 2569 return;
2441 2570
2442 num_scr_allow = 0; 2571 num_scr_allow = 0;
2443 want_refresh = 1; 2572 want_refresh = 1;
2444 2573
2445 if (really) 2574 if (really)
2446 XClearWindow (display->display, vt); 2575 XClearWindow (dpy, vt);
2447} 2576}
2448 2577
2449/* ------------------------------------------------------------------------- */
2450void 2578void
2579rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2580{
2581 int view_end = view_start + nrow;
2582 int row, col;
2583
2584 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2585 {
2586 text_t *stp = ROW(row).t;
2587 rend_t *srp = ROW(row).r;
2588
2589 for (col = beg_col; col < end_col; col++)
2590 srp[col] ^= rstyle1;
2591
2592 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2593 srp[col] ^= rstyle2;
2594
2595 if (++col < end_col)
2596 srp[col] ^= rstyle2;
2597 }
2598}
2599
2600void
2601rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2602{
2603 int view_end = view_start + nrow;
2604 int row, col;
2605
2606 if (beg_row >= view_start)
2607 {
2608 col = beg_col;
2609 row = beg_row;
2610 }
2611 else
2612 {
2613 col = 0;
2614 row = view_start;
2615 }
2616
2617 for (; row < min (end_row, view_end); row++, col = 0)
2618 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2619 srp[col] ^= rstyle;
2620
2621 if (row == end_row)
2622 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2623 srp[col] ^= rstyle;
2624}
2625
2626/* ------------------------------------------------------------------------- */
2627void ecb_hot
2451rxvt_term::scr_reverse_selection () 2628rxvt_term::scr_reverse_selection () NOTHROW
2452{ 2629{
2453 if (selection.op 2630 if (selection.op
2454 && current_screen == selection.screen 2631 && current_screen == selection.screen
2455 && selection.end.row >= -view_start) 2632 && selection.end.row >= view_start)
2456 { 2633 {
2457 int view_end = -view_start + nrow; 2634#if !ENABLE_MINIMAL
2458 int row, col;
2459
2460#if ENABLE_FRILLS
2461 if (selection.rect) 2635 if (selection.rect)
2462 { 2636 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++) 2637 selection.end.row, selection.end.col,
2464 { 2638 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 2639 else
2479#endif 2640#endif
2480 { 2641 scr_xor_span (selection.beg.row, selection.beg.col,
2481 if (selection.beg.row >= -view_start) 2642 selection.end.row, selection.end.col,
2482 { 2643 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 } 2644 }
2501} 2645}
2502 2646
2503/* ------------------------------------------------------------------------- */ 2647/* ------------------------------------------------------------------------- */
2504/* 2648/*
2505 * Dump the whole scrollback and screen to the passed filedescriptor. The 2649 * Dump the whole scrollback and screen to the passed filedescriptor. The
2506 * invoking routine must close the fd. 2650 * invoking routine must close the fd.
2507 */ 2651 */
2508#if 0 2652#if 0
2509void 2653void
2510rxvt_term::scr_dump (int fd) 2654rxvt_term::scr_dump (int fd) NOTHROW
2511{ 2655{
2512 int row, wrote; 2656 // if this method is needed, it can be implemented by factoring the
2513 unsigned int width, towrite; 2657 // 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} 2658}
2533#endif 2659#endif
2534 2660
2535/* ------------------------------------------------------------------------- * 2661/* ------------------------------------------------------------------------- *
2536 * CHARACTER SELECTION * 2662 * CHARACTER SELECTION *
2537 * ------------------------------------------------------------------------- */ 2663 * ------------------------------------------------------------------------- */
2538void 2664void
2539rxvt_term::selection_check (int check_more) 2665rxvt_term::selection_check (int check_more) NOTHROW
2540{ 2666{
2541 row_col_t pos;
2542
2543 if (!selection.op) 2667 if (!selection.op)
2544 return; 2668 return;
2545 2669
2546 pos.row = pos.col = 0;
2547 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2670 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2548 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2671 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2549 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2672 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2550 || (check_more == 1 2673 || (check_more == 1
2551 && current_screen == selection.screen 2674 && current_screen == selection.screen
2552 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2675 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2553 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2676 && 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 (); 2677 CLEAR_ALL_SELECTION ();
2678}
2679
2680void
2681rxvt_term::selection_changed () NOTHROW
2682{
2683 line_t &r1 = ROW (selection.beg.row);
2684 while (selection.beg.col < r1.l && r1.t [selection.beg.col] == NOCHAR)
2685 ++selection.beg.col;
2686
2687 line_t &r2 = ROW (selection.end.row);
2688 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2689 ++selection.end.col;
2690
2691 want_refresh = 1;
2563} 2692}
2564 2693
2565/* ------------------------------------------------------------------------- */ 2694/* ------------------------------------------------------------------------- */
2566/* 2695/*
2567 * Paste a selection direct to the command fd 2696 * Paste a selection direct to the command fd
2568 */ 2697 */
2569void 2698void
2570rxvt_term::paste (char *data, unsigned int len) 2699rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2571{ 2700{
2572 /* convert normal newline chars into common keyboard Return key sequence */ 2701 /* convert normal newline chars into common keyboard Return key sequence */
2573 for (unsigned int i = 0; i < len; i++) 2702 for (unsigned int i = 0; i < len; i++)
2574 if (data[i] == C0_LF) 2703 if (data[i] == C0_LF)
2575 data[i] = C0_CR; 2704 data[i] = C0_CR;
2576 2705
2706 if (priv_modes & PrivMode_BracketPaste)
2707 tt_printf ("\x1b[200~");
2708
2577 tt_write (data, len); 2709 tt_write (data, len);
2578}
2579 2710
2580/* ------------------------------------------------------------------------- */ 2711 if (priv_modes & PrivMode_BracketPaste)
2581/* 2712 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} 2713}
2746 2714
2747void 2715void
2748rxvt_term::incr_cb (time_watcher &w) 2716rxvt_term::paste (char *data, unsigned int len) NOTHROW
2749{ 2717{
2750 selection_wait = Sel_none; 2718 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; 2719 return;
2763 2720
2764 selection_paste (win, prop, true); 2721 tt_paste (data, len);
2765} 2722}
2766 2723
2767/* ------------------------------------------------------------------------- */ 2724/* ------------------------------------------------------------------------- */
2768/* 2725/*
2769 * Request the current selection: 2726 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2770 * Order: > internal selection if available 2727 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2771 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2728 * 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 2729 * EXT: button 2 release
2776 */ 2730 */
2777void 2731void
2778rxvt_term::selection_request (Time tm, int x, int y) 2732rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2779{ 2733{
2780 if (x < 0 || x >= width || y < 0 || y >= height)
2781 return; /* outside window */
2782
2783 if (selection.text) 2734 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 } 2735 {
2790 else 2736 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2737 selection_req->run ();
2791 { 2738 }
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} 2739}
2838 2740
2839/* ------------------------------------------------------------------------- */ 2741/* ------------------------------------------------------------------------- */
2840/* 2742/*
2841 * Clear all selected text 2743 * Clear all selected text
2842 * EXT: SelectionClear 2744 * EXT: SelectionClear
2843 */ 2745 */
2844void 2746void
2845rxvt_term::selection_clear () 2747rxvt_term::selection_clear (bool clipboard) NOTHROW
2846{ 2748{
2749 if (!clipboard)
2750 {
2847 want_refresh = 1; 2751 want_refresh = 1;
2848 free (selection.text); 2752 free (selection.text);
2849 selection.text = NULL; 2753 selection.text = NULL;
2850 selection.len = 0; 2754 selection.len = 0;
2851 CLEAR_SELECTION (); 2755 CLEAR_SELECTION ();
2852 2756
2853 if (display->selection_owner == this) 2757 if (display->selection_owner == this)
2854 display->selection_owner = 0; 2758 display->selection_owner = 0;
2759 }
2760 else
2761 {
2762 free (selection.clip_text);
2763 selection.clip_text = NULL;
2764 selection.clip_len = 0;
2765
2766 if (display->clipboard_owner == this)
2767 display->clipboard_owner = 0;
2768 }
2855} 2769}
2856 2770
2857/* ------------------------------------------------------------------------- */ 2771/* ------------------------------------------------------------------------- */
2858/* 2772/*
2859 * Copy a selection into the cut buffer 2773 * Copy a selection into the cut buffer
2860 * EXT: button 1 or 3 release 2774 * EXT: button 1 or 3 release
2861 */ 2775 */
2862void 2776void
2863rxvt_term::selection_make (Time tm) 2777rxvt_term::selection_make (Time tm)
2864{ 2778{
2865 int i; 2779 int size;
2866 wchar_t *new_selection_text; 2780 wchar_t *new_selection_text;
2867 text_t *t; 2781 text_t *t;
2868 2782
2869 switch (selection.op) 2783 switch (selection.op)
2870 { 2784 {
… …
2883 selection.op = SELECTION_DONE; 2797 selection.op = SELECTION_DONE;
2884 2798
2885 if (selection.clicks == 4) 2799 if (selection.clicks == 4)
2886 return; /* nothing selected, go away */ 2800 return; /* nothing selected, go away */
2887 2801
2888 if (PERL_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2802 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2889 return; 2803 return;
2890 2804
2891 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2805 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2892 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2806 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2893 2807
2894 int ofs = 0; 2808 int ofs = 0;
2895 int extra = 0; 2809 int extra = 0;
2896 2810
2897 int col = selection.beg.col; 2811 int col = selection.beg.col;
… …
2899 2813
2900 int end_col; 2814 int end_col;
2901 2815
2902 for (; row <= selection.end.row; row++, col = 0) 2816 for (; row <= selection.end.row; row++, col = 0)
2903 { 2817 {
2904#if ENABLE_FRILLS 2818#if !ENABLE_MINIMAL
2905 if (selection.rect) 2819 if (selection.rect)
2906 { 2820 {
2907 col = selection.beg.col; 2821 col = selection.beg.col;
2908 end_col = ncol + 1; 2822 end_col = selection.end.col;
2909 } 2823 }
2910 else 2824 else
2911#endif 2825#endif
2912 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2826 end_col = ROW(row).l;
2913 2827
2914 col = max (col, 0); 2828 col = max (col, 0);
2915 2829
2916 if (row == selection.end.row 2830 if (row == selection.end.row)
2917#if ENABLE_FRILLS
2918 || selection.rect
2919#endif
2920 )
2921 min_it (end_col, selection.end.col); 2831 min_it (end_col, selection.end.col);
2922 2832
2923 t = ROW(row).t + col; 2833 t = ROW(row).t + col;
2834
2924 for (; col < end_col; col++) 2835 for (; col < end_col; col++)
2925 { 2836 {
2926 if (*t == NOCHAR) 2837 if (*t == NOCHAR)
2927 t++; 2838 t++;
2928#if ENABLE_COMBINING 2839#if ENABLE_COMBINING
… …
2932 2843
2933 extra -= (len - 1); 2844 extra -= (len - 1);
2934 2845
2935 if (extra < 0) 2846 if (extra < 0)
2936 { 2847 {
2937 extra += i; 2848 extra += size;
2938 i += i; 2849 size += size;
2939 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2850 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
2940 } 2851 }
2941 2852
2942 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2853 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
2943 } 2854 }
2944#endif 2855#endif
2945 else 2856 else
2946 new_selection_text[ofs++] = *t++; 2857 new_selection_text[ofs++] = *t++;
2947 } 2858 }
2948 2859
2949#if ENABLE_FRILLS 2860#if !ENABLE_MINIMAL
2950 if (selection.rect) 2861 if (selection.rect)
2951 { 2862 {
2952 while (ofs 2863 while (ofs
2953 && new_selection_text[ofs - 1] != C0_LF 2864 && new_selection_text[ofs - 1] != C0_LF
2954 && unicode::is_space (new_selection_text[ofs - 1])) 2865 && unicode::is_space (new_selection_text[ofs - 1]))
… …
2956 2867
2957 new_selection_text[ofs++] = C0_LF; 2868 new_selection_text[ofs++] = C0_LF;
2958 } 2869 }
2959 else 2870 else
2960#endif 2871#endif
2961 if (!ROW(row).is_longer () && row != selection.end.row) 2872 if (!ROW(row).is_longer ()
2873 && (row != selection.end.row || end_col != selection.end.col)
2874 && (row != selection.beg.row || selection.beg.col < ncol))
2962 new_selection_text[ofs++] = C0_LF; 2875 new_selection_text[ofs++] = C0_LF;
2963 } 2876 }
2964
2965 if (end_col != selection.end.col)
2966 new_selection_text[ofs++] = C0_LF;
2967 2877
2968 new_selection_text[ofs] = 0; 2878 new_selection_text[ofs] = 0;
2969 2879
2970 if (ofs == 0) 2880 if (ofs == 0)
2971 { 2881 {
… …
2977 2887
2978 // we usually allocate much more than necessary, so realloc it smaller again 2888 // we usually allocate much more than necessary, so realloc it smaller again
2979 selection.len = ofs; 2889 selection.len = ofs;
2980 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 2890 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2981 2891
2982 if (PERL_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END))) 2892 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
2983 return; 2893 return;
2984 2894
2985 selection_grab (tm); 2895 selection_grab (tm);
2986} 2896}
2987 2897
2988bool 2898bool
2989rxvt_term::selection_grab (Time tm) 2899rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
2990{ 2900{
2901 Atom sel;
2902
2903 if (!clipboard)
2904 {
2991 selection_time = tm; 2905 selection_time = tm;
2992 2906 sel = XA_PRIMARY;
2993 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2994 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
2995 { 2907 }
2908 else
2909 {
2910 clipboard_time = tm;
2911 sel = xa[XA_CLIPBOARD];
2912 }
2913
2914 XSetSelectionOwner (dpy, sel, vt, tm);
2915 if (XGetSelectionOwner (dpy, sel) == vt)
2916 {
2996 display->set_selection_owner (this); 2917 display->set_selection_owner (this, clipboard);
2997 return true; 2918 return true;
2998 } 2919 }
2999 else 2920 else
2921 {
2922 selection_clear (clipboard);
3000 return false; 2923 return false;
2924 }
3001 2925
3002#if 0 2926#if 0
3003 XTextProperty ct; 2927 XTextProperty ct;
3004 2928
3005 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 2929 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3006 { 2930 {
3007 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 2931 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3008 XFree (ct.value); 2932 XFree (ct.value);
3009 } 2933 }
3010#endif 2934#endif
… …
3013/* ------------------------------------------------------------------------- */ 2937/* ------------------------------------------------------------------------- */
3014/* 2938/*
3015 * Mark or select text based upon number of clicks: 1, 2, or 3 2939 * Mark or select text based upon number of clicks: 1, 2, or 3
3016 * EXT: button 1 press 2940 * EXT: button 1 press
3017 */ 2941 */
3018void 2942void ecb_cold
3019rxvt_term::selection_click (int clicks, int x, int y) 2943rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3020{ 2944{
3021 clicks = ((clicks - 1) % 3) + 1; 2945 clicks = ((clicks - 1) % 3) + 1;
3022 selection.clicks = clicks; /* save clicks so extend will work */ 2946 selection.clicks = clicks; /* save clicks so extend will work */
3023 2947
2948 if (clicks == 2 && !selection.rect
2949 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
2950 {
2951 MEvent.clicks = 1; // what a mess
2952 selection.screen = current_screen;
2953 selection.op = SELECTION_CONT;
2954 return;
2955 }
2956
3024 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 2957 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3025 2958
3026 if (clicks == 2 || clicks == 3) 2959 if (clicks == 2 || clicks == 3)
3027 selection_extend_colrow (selection.mark.col, 2960 selection_extend_colrow (selection.mark.col,
3028 selection.mark.row + view_start, 2961 selection.mark.row - view_start,
3029 0, /* button 3 */ 2962 0, /* button 3 */
3030 1, /* button press */ 2963 1, /* button press */
3031 0); /* click change */ 2964 0); /* click change */
3032} 2965}
3033 2966
3034/* ------------------------------------------------------------------------- */ 2967/* ------------------------------------------------------------------------- */
3035/* 2968/*
3036 * Mark a selection at the specified col/row 2969 * Mark a selection at the specified col/row
3037 */ 2970 */
3038void 2971void ecb_cold
3039rxvt_term::selection_start_colrow (int col, int row) 2972rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3040{ 2973{
3041 want_refresh = 1; 2974 want_refresh = 1;
3042 2975
3043 selection.mark.row = row - view_start; 2976 selection.mark.row = row + view_start;
3044 selection.mark.col = col; 2977 selection.mark.col = col;
3045 2978
3046 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 2979 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3047 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 2980 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3048 2981
3049 while (selection.mark.col > 0 2982 while (selection.mark.col > 0
3050 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 2983 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3051 --selection.mark.col; 2984 --selection.mark.col;
3052 2985
3053 if (selection.op) 2986 if (selection.op)
2987 {
3054 { /* clear the old selection */ 2988 /* clear the old selection */
3055 selection.beg.row = selection.end.row = selection.mark.row; 2989 selection.beg.row = selection.end.row = selection.mark.row;
3056 selection.beg.col = selection.end.col = selection.mark.col; 2990 selection.beg.col = selection.end.col = selection.mark.col;
3057 } 2991 }
3058 2992
3059 selection.op = SELECTION_INIT; 2993 selection.op = SELECTION_INIT;
… …
3065 * Word select: select text for 2 clicks 2999 * Word select: select text for 2 clicks
3066 * We now only find out the boundary in one direction 3000 * We now only find out the boundary in one direction
3067 */ 3001 */
3068 3002
3069/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3003/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3070#define DELIMIT_TEXT(x) \ 3004#define DELIMIT_TEXT(x) \
3071 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3005 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3072#define DELIMIT_REND(x) 1 3006#define DELIMIT_REND(x) 1
3073 3007
3074void 3008void ecb_cold
3075rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3009rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3076{ 3010{
3077 int col, row, dirnadd, tcol, trow, w1, w2; 3011 int col, row, dirnadd, tcol, trow, w1, w2;
3078 row_col_t bound; 3012 row_col_t bound;
3079 text_t *stp; 3013 text_t *stp;
3080 rend_t *srp; 3014 rend_t *srp;
3081 3015
3082 if (dirn == UP) 3016 if (dirn == UP)
3083 { 3017 {
3084 bound.row = - nsaved - 1; 3018 bound.row = top_row - 1;
3085 bound.col = 0; 3019 bound.col = 0;
3086 dirnadd = -1; 3020 dirnadd = -1;
3087 } 3021 }
3088 else 3022 else
3089 { 3023 {
… …
3153 * EXT: button 3 press; button 1 or 3 drag 3087 * EXT: button 3 press; button 1 or 3 drag
3154 * flag == 0 ==> button 1 3088 * flag == 0 ==> button 1
3155 * flag == 1 ==> button 3 press 3089 * flag == 1 ==> button 3 press
3156 * flag == 2 ==> button 3 motion 3090 * flag == 2 ==> button 3 motion
3157 */ 3091 */
3158void 3092void ecb_cold
3159rxvt_term::selection_extend (int x, int y, int flag) 3093rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3160{ 3094{
3161 int col = clamp (Pixel2Col (x), 0, ncol); 3095 int col = clamp (Pixel2Col (x), 0, ncol);
3162 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3096 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3163 3097
3164 /* 3098 /*
… …
3167 * select nothing. Otherwise, if we're to the right of the mark, you have to 3101 * 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. 3102 * be _past_ a character for it to be selected.
3169 */ 3103 */
3170 if (((selection.clicks % 3) == 1) && !flag 3104 if (((selection.clicks % 3) == 1) && !flag
3171 && (col == selection.mark.col 3105 && (col == selection.mark.col
3172 && (row == selection.mark.row + view_start))) 3106 && (row == selection.mark.row - view_start)))
3173 { 3107 {
3174 /* select nothing */ 3108 /* select nothing */
3175 selection.beg.row = selection.end.row = 0; 3109 selection.beg.row = selection.end.row = 0;
3176 selection.beg.col = selection.end.col = 0; 3110 selection.beg.col = selection.end.col = 0;
3177 selection.clicks = 4; 3111 selection.clicks = 4;
… …
3189 3123
3190/* ------------------------------------------------------------------------- */ 3124/* ------------------------------------------------------------------------- */
3191/* 3125/*
3192 * Extend the selection to the specified col/row 3126 * Extend the selection to the specified col/row
3193 */ 3127 */
3194void 3128void ecb_cold
3195rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3129rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3196{ 3130{
3197 row_col_t pos; 3131 row_col_t pos;
3198 enum { 3132 enum {
3199 LEFT, RIGHT 3133 LEFT, RIGHT
3200 } closeto = RIGHT; 3134 } closeto = RIGHT;
3201
3202 want_refresh = 1;
3203 3135
3204 switch (selection.op) 3136 switch (selection.op)
3205 { 3137 {
3206 case SELECTION_INIT: 3138 case SELECTION_INIT:
3207 CLEAR_SELECTION (); 3139 CLEAR_SELECTION ();
… …
3232 selection.beg.col = selection.end.col = selection.mark.col; 3164 selection.beg.col = selection.end.col = selection.mark.col;
3233 selection.beg.row = selection.end.row = selection.mark.row; 3165 selection.beg.row = selection.end.row = selection.mark.row;
3234 } 3166 }
3235 3167
3236 pos.col = col; 3168 pos.col = col;
3237 pos.row = row - view_start; 3169 pos.row = view_start + row;
3238 3170
3239 /* 3171 /*
3240 * This is mainly xterm style selection with a couple of differences, mainly 3172 * This is mainly xterm style selection with a couple of differences, mainly
3241 * in the way button3 drag extension works. 3173 * in the way button3 drag extension works.
3242 * We're either doing: button1 drag; button3 press; or button3 drag 3174 * 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 3180 * 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 3181 * and it was decided by whichever point/word/line was `fixed' at the
3250 * time of the most recent button3 press 3182 * time of the most recent button3 press
3251 */ 3183 */
3252 if (button3 && buttonpress) 3184 if (button3 && buttonpress)
3185 {
3253 { /* button3 press */ 3186 /* button3 press */
3254 /* 3187 /*
3255 * first determine which edge of the selection we are closest to 3188 * first determine which edge of the selection we are closest to
3256 */ 3189 */
3257 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3190 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3258 || (!ROWCOL_IS_AFTER (pos, selection.end) 3191 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3276 selection.mark.row = selection.beg.row; 3209 selection.mark.row = selection.beg.row;
3277 selection.mark.col = selection.beg.col; 3210 selection.mark.col = selection.beg.col;
3278 } 3211 }
3279 } 3212 }
3280 else 3213 else
3214 {
3281 { /* button1 drag or button3 drag */ 3215 /* button1 drag or button3 drag */
3282 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3216 if (ROWCOL_IS_AFTER (selection.mark, pos))
3283 { 3217 {
3284 if (selection.mark.row == selection.end.row 3218 if (selection.mark.row == selection.end.row
3285 && selection.mark.col == selection.end.col 3219 && selection.mark.col == selection.end.col
3286 && clickchange 3220 && clickchange
… …
3303 3237
3304 if (selection.clicks == 1) 3238 if (selection.clicks == 1)
3305 { 3239 {
3306 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3240 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3307 && !ROW(selection.beg.row).is_longer () 3241 && !ROW(selection.beg.row).is_longer ()
3308#if ENABLE_FRILLS 3242#if !ENABLE_MINIMAL
3309 && !selection.rect 3243 && !selection.rect
3310#endif 3244#endif
3311 ) 3245 )
3312 selection.beg.col = ncol; 3246 selection.beg.col = ncol;
3313 3247
3314 if ( 3248 if (
3315 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3249 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3316 && !ROW(selection.end.row).is_longer () 3250 && !ROW(selection.end.row).is_longer ()
3317#if ENABLE_FRILLS 3251#if !ENABLE_MINIMAL
3318 && !selection.rect 3252 && !selection.rect
3319#endif 3253#endif
3320 ) 3254 )
3321 selection.end.col = ncol; 3255 selection.end.col = ncol;
3322 } 3256 }
3323 else if (selection.clicks == 2) 3257 else if (selection.clicks == 2)
3324 { 3258 {
3325 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3259 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3326 selection.end.col--; 3260 selection.end.col--;
3327 3261
3328 if (!PERL_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3329 {
3330 selection_delimit_word (UP, &selection.beg, &selection.beg); 3262 selection_delimit_word (UP, &selection.beg, &selection.beg);
3331 selection_delimit_word (DN, &selection.end, &selection.end); 3263 selection_delimit_word (DN, &selection.end, &selection.end);
3332 }
3333 } 3264 }
3334 else if (selection.clicks == 3) 3265 else if (selection.clicks == 3)
3335 { 3266 {
3336#if ENABLE_FRILLS 3267#if ENABLE_FRILLS
3337 if (OPTION (Opt_tripleclickwords)) 3268 if (option (Opt_tripleclickwords))
3338 { 3269 {
3339 selection_delimit_word (UP, &selection.beg, &selection.beg); 3270 selection_delimit_word (UP, &selection.beg, &selection.beg);
3340 3271
3341 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3272 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3342 { 3273 {
3343 if (!ROW(end_row).is_longer ()) 3274 if (!ROW(end_row).is_longer ())
3344 { 3275 {
3345 selection.end.row = end_row; 3276 selection.end.row = end_row;
3346 selection.end.col = ROW(end_row).l; 3277 selection.end.col = ROW(end_row).l;
3278# if !ENABLE_MINIMAL
3347 selection_remove_trailing_spaces (); 3279 selection_remove_trailing_spaces ();
3280# endif
3348 break; 3281 break;
3349 } 3282 }
3350 } 3283 }
3351 } 3284 }
3352 else 3285 else
… …
3368 selection.end.row++; 3301 selection.end.row++;
3369 } 3302 }
3370 } 3303 }
3371 3304
3372 if (button3 && buttonpress) 3305 if (button3 && buttonpress)
3306 {
3373 { /* mark may need to be changed */ 3307 /* mark may need to be changed */
3374 if (closeto == LEFT) 3308 if (closeto == LEFT)
3375 { 3309 {
3376 selection.mark.row = selection.end.row; 3310 selection.mark.row = selection.end.row;
3377 selection.mark.col = selection.end.col - (selection.clicks == 2); 3311 selection.mark.col = selection.end.col - (selection.clicks == 2);
3378 } 3312 }
… …
3381 selection.mark.row = selection.beg.row; 3315 selection.mark.row = selection.beg.row;
3382 selection.mark.col = selection.beg.col; 3316 selection.mark.col = selection.beg.col;
3383 } 3317 }
3384 } 3318 }
3385 3319
3386#if ENABLE_FRILLS 3320#if !ENABLE_MINIMAL
3387 if (selection.rect && selection.beg.col > selection.end.col) 3321 if (selection.rect && selection.beg.col > selection.end.col)
3388 ::swap (selection.beg.col, selection.end.col); 3322 ::swap (selection.beg.col, selection.end.col);
3389#endif 3323#endif
3390}
3391 3324
3392#if ENABLE_FRILLS 3325 selection_changed ();
3393void 3326}
3327
3328#if !ENABLE_MINIMAL
3329void ecb_cold
3394rxvt_term::selection_remove_trailing_spaces () 3330rxvt_term::selection_remove_trailing_spaces () NOTHROW
3395{ 3331{
3396 int32_t end_col, end_row; 3332 int32_t end_col, end_row;
3397 text_t *stp; 3333 text_t *stp;
3398 3334
3399 end_col = selection.end.col; 3335 end_col = selection.end.col;
… …
3436/* ------------------------------------------------------------------------- */ 3372/* ------------------------------------------------------------------------- */
3437/* 3373/*
3438 * Double click on button 3 when already selected 3374 * Double click on button 3 when already selected
3439 * EXT: button 3 double click 3375 * EXT: button 3 double click
3440 */ 3376 */
3441void 3377void ecb_cold
3442rxvt_term::selection_rotate (int x, int y) 3378rxvt_term::selection_rotate (int x, int y) NOTHROW
3443{ 3379{
3444 selection.clicks = selection.clicks % 3 + 1; 3380 selection.clicks = selection.clicks % 3 + 1;
3445 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3381 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3446} 3382}
3447 3383
3448/* ------------------------------------------------------------------------- */ 3384/* ------------------------------------------------------------------------- */
3449/* 3385/*
3450 * Respond to a request for our current selection 3386 * Respond to a request for our current selection
3451 * EXT: SelectionRequest 3387 * EXT: SelectionRequest
3452 */ 3388 */
3453void 3389void ecb_cold
3454rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3390rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3455{ 3391{
3392 Atom property = rq.property == None ? rq.target : rq.property;
3456 XSelectionEvent ev; 3393 XSelectionEvent ev;
3457 dDisp;
3458 3394
3459 ev.type = SelectionNotify; 3395 ev.type = SelectionNotify;
3460 ev.property = None; 3396 ev.property = None;
3461 ev.display = rq.display; 3397 ev.display = rq.display;
3462 ev.requestor = rq.requestor; 3398 ev.requestor = rq.requestor;
… …
3476 *target++ = xa[XA_COMPOUND_TEXT]; 3412 *target++ = xa[XA_COMPOUND_TEXT];
3477#if X_HAVE_UTF8_STRING 3413#if X_HAVE_UTF8_STRING
3478 *target++ = xa[XA_UTF8_STRING]; 3414 *target++ = xa[XA_UTF8_STRING];
3479#endif 3415#endif
3480 3416
3481 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3417 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3482 32, PropModeReplace, 3418 32, PropModeReplace,
3483 (unsigned char *)target_list, target - target_list); 3419 (unsigned char *)target_list, target - target_list);
3484 ev.property = rq.property; 3420 ev.property = property;
3485 } 3421 }
3486#if TODO // TODO 3422#if TODO // TODO
3487 else if (rq.target == xa[XA_MULTIPLE]) 3423 else if (rq.target == xa[XA_MULTIPLE])
3488 { 3424 {
3489 /* TODO: Handle MULTIPLE */ 3425 /* TODO: Handle MULTIPLE */
3490 } 3426 }
3491#endif 3427#endif
3492 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3428 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3493 { 3429 {
3494 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3430 XChangeProperty (dpy, rq.requestor, property, rq.target,
3495 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3431 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3496 ev.property = rq.property; 3432 ev.property = property;
3433 }
3434 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3435 {
3436 XChangeProperty (dpy, rq.requestor, property, rq.target,
3437 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3438 ev.property = property;
3497 } 3439 }
3498 else if (rq.target == XA_STRING 3440 else if (rq.target == XA_STRING
3499 || rq.target == xa[XA_TEXT] 3441 || rq.target == xa[XA_TEXT]
3500 || rq.target == xa[XA_COMPOUND_TEXT] 3442 || rq.target == xa[XA_COMPOUND_TEXT]
3501 || rq.target == xa[XA_UTF8_STRING] 3443 || rq.target == xa[XA_UTF8_STRING]
… …
3523 style = enc_string; 3465 style = enc_string;
3524 else if (target == xa[XA_TEXT]) 3466 else if (target == xa[XA_TEXT])
3525 style = enc_text; 3467 style = enc_text;
3526 else if (target == xa[XA_COMPOUND_TEXT]) 3468 else if (target == xa[XA_COMPOUND_TEXT])
3527 style = enc_compound_text; 3469 style = enc_compound_text;
3528#if ENABLE_FRILLS 3470#if !ENABLE_MINIMAL
3529 else if (target == xa[XA_UTF8_STRING]) 3471 else if (target == xa[XA_UTF8_STRING])
3530 style = enc_utf8; 3472 style = enc_utf8;
3531#endif 3473#endif
3532 else 3474 else
3533 { 3475 {
3534 target = xa[XA_COMPOUND_TEXT]; 3476 target = xa[XA_COMPOUND_TEXT];
3535 style = enc_compound_text; 3477 style = enc_compound_text;
3536 } 3478 }
3537 3479
3538 if (selection.text) 3480 if (rq.selection == XA_PRIMARY && selection.text)
3539 { 3481 {
3540 cl = selection.text; 3482 cl = selection.text;
3541 selectlen = selection.len; 3483 selectlen = selection.len;
3542 } 3484 }
3485 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3486 {
3487 cl = selection.clip_text;
3488 selectlen = selection.clip_len;
3489 }
3543 else 3490 else
3544 { 3491 {
3545 cl = L""; 3492 cl = L"";
3546 selectlen = 0; 3493 selectlen = 0;
3547 } 3494 }
3548 3495
3549#if ENABLE_FRILLS 3496#if !ENABLE_MINIMAL
3550 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3497 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3551 // so recode it manually 3498 // so recode it manually
3552 if (style == enc_utf8) 3499 if (style == enc_utf8)
3553 { 3500 {
3554 freect = 1; 3501 freect = 1;
… …
3557 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3504 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3558 ct.nitems = strlen ((char *)ct.value); 3505 ct.nitems = strlen ((char *)ct.value);
3559 } 3506 }
3560 else 3507 else
3561#endif 3508#endif
3562 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3509 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3563 freect = 1; 3510 freect = 1;
3564 else 3511 else
3565 { 3512 {
3566 /* if we failed to convert then send it raw */ 3513 /* if we failed to convert then send it raw */
3567 ct.value = (unsigned char *)cl; 3514 ct.value = (unsigned char *)cl;
3568 ct.nitems = selectlen; 3515 ct.nitems = selectlen;
3569 ct.encoding = target; 3516 ct.encoding = target;
3570 } 3517 }
3571 3518
3572 XChangeProperty (disp, rq.requestor, rq.property, 3519 XChangeProperty (dpy, rq.requestor, property,
3573 ct.encoding, 8, PropModeReplace, 3520 ct.encoding, 8, PropModeReplace,
3574 ct.value, (int)ct.nitems); 3521 ct.value, (int)ct.nitems);
3575 ev.property = rq.property; 3522 ev.property = property;
3576 3523
3577 if (freect) 3524 if (freect)
3578 XFree (ct.value); 3525 XFree (ct.value);
3579 } 3526 }
3580 3527
3581 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3528 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3582} 3529}
3583 3530
3584/* ------------------------------------------------------------------------- * 3531/* ------------------------------------------------------------------------- */
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 3532#if USE_XIM
3602void 3533void ecb_cold
3603rxvt_term::im_set_position (XPoint &pos) 3534rxvt_term::im_set_position (XPoint &pos) NOTHROW
3604{ 3535{
3605 XWindowAttributes xwa; 3536 XWindowAttributes xwa;
3606 3537
3607 XGetWindowAttributes (display->display, vt, &xwa); 3538 XGetWindowAttributes (dpy, vt, &xwa);
3608 3539
3609 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3540 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3610 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3541 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3611} 3542}
3612#endif 3543#endif
3613 3544
3614#if ENABLE_OVERLAY 3545#if ENABLE_OVERLAY
3615void 3546void
3616rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3547rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3617{ 3548{
3618 if (nrow < 1 || ncol < 1) 3549 if (nrow < 1 || ncol < 1)
3619 return; 3550 return;
3620 3551
3621 want_refresh = 1; 3552 want_refresh = 1;
… …
3630 h += 2; min_it (h, nrow); 3561 h += 2; min_it (h, nrow);
3631 3562
3632 x -= 1; clamp_it (x, 0, ncol - w); 3563 x -= 1; clamp_it (x, 0, ncol - w);
3633 y -= 1; clamp_it (y, 0, nrow - h); 3564 y -= 1; clamp_it (y, 0, nrow - h);
3634 3565
3635 ov_x = x; ov_y = y; 3566 ov.x = x; ov.y = y;
3636 ov_w = w; ov_h = h; 3567 ov.w = w; ov.h = h;
3637 3568
3638 ov_text = new text_t *[h]; 3569 ov.text = new text_t *[h];
3639 ov_rend = new rend_t *[h]; 3570 ov.rend = new rend_t *[h];
3640 3571
3641 for (y = 0; y < h; y++) 3572 for (y = 0; y < h; y++)
3642 { 3573 {
3643 text_t *tp = ov_text[y] = new text_t[w]; 3574 text_t *tp = ov.text[y] = new text_t[w];
3644 rend_t *rp = ov_rend[y] = new rend_t[w]; 3575 rend_t *rp = ov.rend[y] = new rend_t[w];
3645 3576
3646 text_t t0, t1, t2; 3577 text_t t0, t1, t2;
3647 rend_t r = OVERLAY_RSTYLE; 3578 rend_t r = OVERLAY_RSTYLE;
3648 3579
3649 if (y == 0) 3580 if (y == 0)
… …
3666 *rp = r; 3597 *rp = r;
3667 } 3598 }
3668} 3599}
3669 3600
3670void 3601void
3671rxvt_term::scr_overlay_off () 3602rxvt_term::scr_overlay_off () NOTHROW
3672{ 3603{
3673 if (!ov_text) 3604 if (!ov.text)
3674 return; 3605 return;
3675 3606
3676 want_refresh = 1; 3607 want_refresh = 1;
3677 3608
3678 for (int y = 0; y < ov_h; y++) 3609 for (int y = 0; y < ov.h; y++)
3679 { 3610 {
3680 delete [] ov_text[y]; 3611 delete [] ov.text[y];
3681 delete [] ov_rend[y]; 3612 delete [] ov.rend[y];
3682 } 3613 }
3683 3614
3684 delete [] ov_text; ov_text = 0; 3615 delete [] ov.text; ov.text = 0;
3685 delete [] ov_rend; ov_rend = 0; 3616 delete [] ov.rend; ov.rend = 0;
3686} 3617}
3687 3618
3688void 3619void
3689rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3620rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3690{ 3621{
3691 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3622 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3692 return; 3623 return;
3693 3624
3694 x++, y++; 3625 x++, y++;
3695 3626
3696 ov_text[y][x] = text; 3627 ov.text[y][x] = text;
3697 ov_rend[y][x] = rend; 3628 ov.rend[y][x] = rend;
3698} 3629}
3699 3630
3700void 3631void
3701rxvt_term::scr_overlay_set (int x, int y, const char *s) 3632rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3702{ 3633{
3703 while (*s) 3634 while (*s)
3704 scr_overlay_set (x++, y, *s++); 3635 scr_overlay_set (x++, y, *s++);
3705} 3636}
3706 3637
3707void 3638void
3708rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3639rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3709{ 3640{
3710 while (*s) 3641 while (*s)
3711 { 3642 {
3712 text_t t = *s++; 3643 text_t t = *s++;
3713 int width = wcwidth (t); 3644 int width = WCWIDTH (t);
3714 3645
3715 while (width--) 3646 while (width--)
3716 { 3647 {
3717 scr_overlay_set (x++, y, t); 3648 scr_overlay_set (x++, y, t);
3718 t = NOCHAR; 3649 t = NOCHAR;
3719 } 3650 }
3720 } 3651 }
3721} 3652}
3722 3653
3723void 3654void
3724rxvt_term::scr_swap_overlay () 3655rxvt_term::scr_swap_overlay () NOTHROW
3725{ 3656{
3726 if (!ov_text) 3657 if (!ov.text)
3727 return; 3658 return;
3728 3659
3660 // hide cursor if it is within the overlay area
3661 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3662 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3663 screen.flags &= ~Screen_VisibleCursor;
3664
3729 // swap screen mem with overlay 3665 // swap screen mem with overlay
3730 for (int y = ov_h; y--; ) 3666 for (int y = ov.h; y--; )
3731 { 3667 {
3732 text_t *t1 = ov_text[y]; 3668 text_t *t1 = ov.text[y];
3733 rend_t *r1 = ov_rend[y]; 3669 rend_t *r1 = ov.rend[y];
3734 3670
3735 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x; 3671 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; 3672 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3737 3673
3738 for (int x = ov_w; x--; ) 3674 for (int x = ov.w; x--; )
3739 { 3675 {
3740 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3676 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3741 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3677 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3742 } 3678 }
3743 } 3679 }

Diff Legend

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