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

Diff Legend

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