ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.209 by root, Thu Jan 5 01:04:10 2006 UTC vs.
Revision 1.434 by root, Sat Feb 16 17:26:53 2013 UTC

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

Diff Legend

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