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.204 by root, Mon Jan 2 15:35:43 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);
809
727 if (nlines > 0 810 if (minlines > 0
728 && screen.tscroll == 0 811 && screen.tscroll == 0
729 && screen.bscroll == (nrow - 1)) 812 && screen.bscroll == nrow - 1)
730 { 813 {
731 /* _at least_ this many lines need to be scrolled */ 814 /* _at least_ this many lines need to be scrolled */
732 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 815 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
733 screen.cur.row -= nlines; 816 screen.cur.row -= minlines;
734 } 817 }
735 } 818 }
736 819
737#ifdef DEBUG_STRICT
738 assert (screen.cur.col < last_col); 820 assert (screen.cur.col < ncol);
739 assert (screen.cur.row < nrow 821 assert (screen.cur.row < nrow
740 && screen.cur.row >= -nsaved); 822 && screen.cur.row >= top_row);
741#endif
742 int row = screen.cur.row; 823 int row = screen.cur.row;
743 824
744 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 825 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
745 826
746 line_t *line = &ROW(row); 827 line_t *line = &ROW(row);
747 828
748 while (str < strend) 829 while (str < strend)
749 { 830 {
750 c = *str++; 831 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
751 832
752 if (c < 0x20) 833 if (ecb_unlikely (c < 0x20))
753 if (c == C0_LF) 834 if (c == C0_LF)
754 { 835 {
755 if (!line->is_longer ()) /* XXX: think about this */
756 max_it (line->l, screen.cur.col); 836 max_it (line->l, screen.cur.col);
757 837
758 screen.flags &= ~Screen_WrapNext; 838 screen.flags &= ~Screen_WrapNext;
759 839
760 if (screen.cur.row == screen.bscroll) 840 if (screen.cur.row == screen.bscroll)
761 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 841 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
765 line = &ROW(row); /* _must_ refresh */ 845 line = &ROW(row); /* _must_ refresh */
766 continue; 846 continue;
767 } 847 }
768 else if (c == C0_CR) 848 else if (c == C0_CR)
769 { 849 {
770 if (!line->is_longer ()) /* XXX: think about this */
771 max_it (line->l, screen.cur.col); 850 max_it (line->l, screen.cur.col);
772 851
773 screen.flags &= ~Screen_WrapNext; 852 screen.flags &= ~Screen_WrapNext;
774 screen.cur.col = 0; 853 screen.cur.col = 0;
775 continue; 854 continue;
776 } 855 }
… …
778 { 857 {
779 scr_tab (1, true); 858 scr_tab (1, true);
780 continue; 859 continue;
781 } 860 }
782 861
862 if (ecb_unlikely (
783 if (checksel /* see if we're writing within selection */ 863 checksel /* see if we're writing within selection */
784 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 864 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
785 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 865 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
866 ))
786 { 867 {
787 checksel = 0; 868 checksel = 0;
788 /* 869 /*
789 * If we wrote anywhere in the selected area, kill the selection 870 * If we wrote anywhere in the selected area, kill the selection
790 * XXX: should we kill the mark too? Possibly, but maybe that 871 * XXX: should we kill the mark too? Possibly, but maybe that
791 * should be a similar check. 872 * should be a similar check.
792 */ 873 */
793 CLEAR_SELECTION (); 874 CLEAR_SELECTION ();
794 } 875 }
795 876
796 if (screen.flags & Screen_WrapNext) 877 if (ecb_unlikely (screen.flags & Screen_WrapNext))
797 { 878 {
798 line->set_is_longer ();
799
800 scr_do_wrap (); 879 scr_do_wrap ();
801 880
881 line->l = ncol;
882 line->is_longer (1);
883
802 row = screen.cur.row; 884 row = screen.cur.row;
803 line = &ROW(row); /* _must_ refresh */ 885 line = &ROW(row); /* _must_ refresh */
804 } 886 }
805 887
806 // some utf-8 decoders "decode" surrogate characters: let's fix this. 888 // some utf-8 decoders "decode" surrogate characters: let's fix this.
807 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 889 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
808 c = 0xfffd; 890 c = 0xfffd;
809 891
810 // 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
811 // do wcwidth before further replacements, as wcwidth might return -1 893 // further replacements, as wcwidth might return -1 for the line
812 // for the line drawing characters below as they might be invalid in the current 894 // drawing characters below as they might be invalid in the current
813 // locale. 895 // locale.
814 int width = c < 0x100 ? 1 : wcwidth (c); 896 int width = WCWIDTH (c);
815 897
816 if (charsets[screen.charset] == '0') // DEC SPECIAL 898 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
817 { 899 {
818 // vt100 special graphics and line drawing 900 // vt100 special graphics and line drawing
819 // 5f-7e standard vt100 901 // 5f-7e standard vt100
820 // 40-5e rxvt extension for extra curses acs chars 902 // 40-5e rxvt extension for extra curses acs chars
821 static uint16_t vt100_0[62] = { // 41 .. 7e 903 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
834 c = vt100_0[c - 0x41]; 916 c = vt100_0[c - 0x41];
835 width = 1; // vt100 line drawing characters are always single-width 917 width = 1; // vt100 line drawing characters are always single-width
836 } 918 }
837 } 919 }
838 920
839 if (screen.flags & Screen_Insert) 921 if (ecb_unlikely (screen.flags & Screen_Insert))
840 scr_insdel_chars (width, INSERT); 922 scr_insdel_chars (width, INSERT);
841 923
842 if (width != 0) 924 if (width != 0)
843 { 925 {
844#if !UNICODE_3 926#if !UNICODE_3
… …
849# else 931# else
850 c = 0xfffd; 932 c = 0xfffd;
851# endif 933# endif
852#endif 934#endif
853 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
854 // 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.
855 if (line->t[screen.cur.col] == NOCHAR 956 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
856 || (screen.cur.col < ncol - 1 957 scr_kill_char (*line, screen.cur.col);
857 && line->t[screen.cur.col + 1] == NOCHAR))
858 {
859 int col = screen.cur.col;
860 958
861 // find begin 959 line->touch ();
862 while (col > 0 && line->t[col] == NOCHAR)
863 col--;
864
865 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
866
867 // found begin, nuke
868 do {
869 line->t[col] = ' ';
870 line->r[col] = rend;
871 col++;
872 } while (col < ncol && line->t[col] == NOCHAR);
873 }
874
875 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
876
877 // if the character doesn't fit into the remaining columns...
878 if (screen.cur.col > last_col - width && last_col >= width)
879 {
880 // ...output spaces
881 c = ' ';
882 // and try the same character next loop iteration
883 --str;
884 }
885 960
886 do 961 do
887 { 962 {
888 line->t[screen.cur.col] = c; 963 line->t[screen.cur.col] = c;
889 line->r[screen.cur.col] = rend; 964 line->r[screen.cur.col] = rend;
890 965
891 if (screen.cur.col < last_col - 1) 966 if (ecb_likely (screen.cur.col < ncol - 1))
892 screen.cur.col++; 967 screen.cur.col++;
893 else 968 else
894 { 969 {
895 line->l = last_col; 970 line->l = ncol;
896 if (screen.flags & Screen_Autowrap) 971 if (screen.flags & Screen_Autowrap)
897 screen.flags |= Screen_WrapNext; 972 screen.flags |= Screen_WrapNext;
898 break; 973
974 goto end_of_line;
899 } 975 }
900 976
901 c = NOCHAR; 977 c = NOCHAR;
902 } 978 }
903 while (--width > 0); 979 while (ecb_unlikely (--width > 0));
904 980
905 // pad with spaces when overwriting wide character with smaller one 981 // pad with spaces when overwriting wide character with smaller one
906 if (!width)
907 for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) 982 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
908 { 983 {
909 line->t[c] = ' '; 984 line->t[c] = ' ';
910 line->r[c] = rend; 985 line->r[c] = rend;
911 } 986 }
987
988end_of_line:
912 } 989 ;
990 }
991#if ENABLE_COMBINING
913 else // width == 0 992 else // width == 0
914 { 993 {
915#if ENABLE_COMBINING 994 if (c != 0xfeff) // ignore BOM
916 // handle combining characters
917 // we just tag the accent on the previous on-screen character.
918 // this is arguably not correct, but also arguably not wrong.
919 // we don't handle double-width characters nicely yet.
920 text_t *tp;
921 rend_t *rp;
922
923 if (screen.cur.col > 0)
924 { 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;
925 tp = line->t + screen.cur.col - 1; 1007 tp = line->t + screen.cur.col - 1;
926 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;
927 1019
1020 linep->touch ();
1021
928 while (*tp == NOCHAR && tp > line->t) 1022 while (*tp == NOCHAR && tp > linep->t)
929 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));
930 } 1032 }
931 else if (screen.cur.row > 0
932 && ROW(screen.cur.row - 1).is_longer ())
933 {
934 line_t *line = &ROW(screen.cur.row - 1);
935
936 tp = line->t + last_col - 1;
937 rp = line->r + last_col - 1;
938
939 while (*tp == NOCHAR && tp > line->t)
940 tp--, rp--;
941 } 1033 }
942 else
943 continue;
944
945 // first try to find a precomposed character
946 unicode_t n = rxvt_compose (*tp, c);
947 if (n == NOCHAR)
948 n = rxvt_composite.compose (*tp, c);
949
950 *tp = n;
951 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
952#endif 1034#endif
953 }
954 } 1035 }
955 1036
956 if (!line->is_longer ()) /* XXX: think about this */
957 max_it (line->l, screen.cur.col); 1037 max_it (line->l, screen.cur.col);
958 1038
959#ifdef DEBUG_STRICT
960 assert (screen.cur.row >= 0); 1039 assert (screen.cur.row >= 0);
961#endif
962} 1040}
963 1041
964/* ------------------------------------------------------------------------- */ 1042/* ------------------------------------------------------------------------- */
965/* 1043/*
966 * 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
967 * XTERM_SEQ: CTRL-H 1045 * XTERM_SEQ: CTRL-H
968 */ 1046 */
969void 1047void
970rxvt_term::scr_backspace () 1048rxvt_term::scr_backspace () NOTHROW
971{ 1049{
972 want_refresh = 1;
973
974 if (screen.cur.col == 0) 1050 if (screen.cur.col == 0)
975 { 1051 {
976 if (screen.cur.row > 0) 1052 if (screen.cur.row > 0)
977 { 1053 {
978#ifdef TERMCAP_HAS_BW 1054#ifdef TERMCAP_HAS_BW
979 screen.cur.col = ncol - 1; 1055 screen.cur.col = ncol - 1;
980 screen.cur.row--; 1056 --screen.cur.row;
981 return; 1057
1058 want_refresh = 1;
982#endif 1059#endif
983 } 1060 }
984 } 1061 }
985 else if (!(screen.flags & Screen_WrapNext)) 1062 else if (screen.flags & Screen_WrapNext)
1063 screen.flags &= ~Screen_WrapNext;
1064 else
986 scr_gotorc (0, -1, RELATIVE); 1065 scr_gotorc (0, -1, RELATIVE);
987
988 screen.flags &= ~Screen_WrapNext;
989} 1066}
990 1067
991/* ------------------------------------------------------------------------- */ 1068/* ------------------------------------------------------------------------- */
992/* 1069/*
993 * Process Horizontal Tab 1070 * Process Horizontal Tab
994 * count: +ve = forward; -ve = backwards 1071 * count: +ve = forward; -ve = backwards
995 * XTERM_SEQ: CTRL-I 1072 * XTERM_SEQ: CTRL-I
996 */ 1073 */
997void 1074void
998rxvt_term::scr_tab (int count, bool ht) 1075rxvt_term::scr_tab (int count, bool ht) NOTHROW
999{ 1076{
1000 int i, x; 1077 int i, x;
1001 1078
1002 want_refresh = 1; 1079 want_refresh = 1;
1003 i = x = screen.cur.col; 1080 i = x = screen.cur.col;
… …
1012 1089
1013 for (; ++i < ncol; ) 1090 for (; ++i < ncol; )
1014 if (tabs[i]) 1091 if (tabs[i])
1015 { 1092 {
1016 x = i; 1093 x = i;
1094
1017 if (!--count) 1095 if (!--count)
1018 break; 1096 break;
1019 } 1097 }
1020 else 1098 else
1021 ht &= l.t[i] == ' ' 1099 ht &= l.t[i] == ' '
1022 && RS_SAME (l.r[i], base_rend); 1100 && RS_SAME (l.r[i], base_rend);
1023 1101
1024 if (count) 1102 if (count)
1025 x = ncol - 1; 1103 x = ncol - 1;
1026 1104
1027 // store horizontal tab commands as characters inside the text 1105 // store horizontal tab commands as characters inside the text
1028 // buffer so they can be selected and pasted. 1106 // buffer so they can be selected and pasted.
1029 if (ht && OPTION (Opt_pastableTabs)) 1107 if (ht && option (Opt_pastableTabs))
1030 { 1108 {
1031 base_rend = SET_FONT (base_rend, 0); 1109 base_rend = SET_FONT (base_rend, 0);
1032 1110
1033 if (!l.is_longer ()) /* XXX: think about this */ 1111 l.touch (x);
1034 max_it (l.l, x);
1035 1112
1036 i = screen.cur.col; 1113 i = screen.cur.col;
1037 1114
1038 l.t[i] = '\t'; 1115 l.t[i] = '\t';
1039 l.r[i] = base_rend; 1116 l.r[i] = base_rend;
… …
1068 * Process DEC Back Index 1145 * Process DEC Back Index
1069 * XTERM_SEQ: ESC 6 1146 * XTERM_SEQ: ESC 6
1070 * 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
1071 * in that row right. Clear left column. 1148 * in that row right. Clear left column.
1072 */ 1149 */
1073#if ENABLE_FRILLS 1150#if !ENABLE_MINIMAL
1074void 1151void ecb_cold
1075rxvt_term::scr_backindex () 1152rxvt_term::scr_backindex () NOTHROW
1076{ 1153{
1077 if (screen.cur.col > 0) 1154 if (screen.cur.col > 0)
1078 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1155 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1079 else 1156 else
1080 scr_insdel_chars (1, INSERT); 1157 scr_insdel_chars (1, INSERT);
… …
1085 * Process DEC Forward Index 1162 * Process DEC Forward Index
1086 * XTERM_SEQ: ESC 9 1163 * XTERM_SEQ: ESC 9
1087 * 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
1088 * in that row left. Clear right column. 1165 * in that row left. Clear right column.
1089 */ 1166 */
1090#if ENABLE_FRILLS 1167#if !ENABLE_MINIMAL
1091void 1168void ecb_cold
1092rxvt_term::scr_forwardindex () 1169rxvt_term::scr_forwardindex () NOTHROW
1093{ 1170{
1094 if (screen.cur.col < ncol - 1) 1171 if (screen.cur.col < ncol - 1)
1095 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1172 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1096 else 1173 else
1097 { 1174 {
1098 if (ROW(screen.cur.row).is_longer ()) //TODO//FIXME//LEN 1175 line_t &l = ROW(screen.cur.row);
1099 ROW(screen.cur.row).l = ncol; 1176
1177 l.touch ();
1178 l.is_longer (0);
1100 1179
1101 scr_gotorc (0, 0, R_RELATIVE); 1180 scr_gotorc (0, 0, R_RELATIVE);
1102 scr_insdel_chars (1, DELETE); 1181 scr_insdel_chars (1, DELETE);
1103 scr_gotorc (0, ncol - 1, R_RELATIVE); 1182 scr_gotorc (0, ncol - 1, R_RELATIVE);
1104 } 1183 }
… …
1108/* ------------------------------------------------------------------------- */ 1187/* ------------------------------------------------------------------------- */
1109/* 1188/*
1110 * Goto Row/Column 1189 * Goto Row/Column
1111 */ 1190 */
1112void 1191void
1113rxvt_term::scr_gotorc (int row, int col, int relative) 1192rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1114{ 1193{
1115 want_refresh = 1; 1194 want_refresh = 1;
1116 ZERO_SCROLLBACK (); 1195 ZERO_SCROLLBACK ();
1117 1196
1118 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1197 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1140 } 1219 }
1141 } 1220 }
1142 else 1221 else
1143 { 1222 {
1144 if (screen.flags & Screen_Relative) 1223 if (screen.flags & Screen_Relative)
1224 {
1145 { /* relative origin mode */ 1225 /* relative origin mode */
1146 screen.cur.row = row + screen.tscroll; 1226 screen.cur.row = row + screen.tscroll;
1147 min_it (screen.cur.row, screen.bscroll); 1227 min_it (screen.cur.row, screen.bscroll);
1148 } 1228 }
1149 else 1229 else
1150 screen.cur.row = row; 1230 screen.cur.row = row;
… …
1156/* ------------------------------------------------------------------------- */ 1236/* ------------------------------------------------------------------------- */
1157/* 1237/*
1158 * direction should be UP or DN 1238 * direction should be UP or DN
1159 */ 1239 */
1160void 1240void
1161rxvt_term::scr_index (enum page_dirn direction) 1241rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1162{ 1242{
1163 int dirn; 1243 int dirn;
1164 1244
1165 want_refresh = 1; 1245 want_refresh = 1;
1166 ZERO_SCROLLBACK (); 1246 ZERO_SCROLLBACK ();
… …
1183/* 1263/*
1184 * Erase part or whole of a line 1264 * Erase part or whole of a line
1185 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1265 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1186 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1266 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1187 * 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
1188 */ 1269 */
1189void 1270void
1190rxvt_term::scr_erase_line (int mode) 1271rxvt_term::scr_erase_line (int mode) NOTHROW
1191{ 1272{
1192 unsigned int col, num; 1273 unsigned int col, num;
1193 1274
1194 want_refresh = 1; 1275 want_refresh = 1;
1195 ZERO_SCROLLBACK (); 1276 ZERO_SCROLLBACK ();
1196 1277
1197 selection_check (1); 1278 selection_check (1);
1198 1279
1199 line_t &line = ROW(screen.cur.row); 1280 line_t &line = ROW(screen.cur.row);
1200 1281
1282 line.touch ();
1283 line.is_longer (0);
1284
1201 switch (mode) 1285 switch (mode)
1202 { 1286 {
1287 case 3:
1288 if (screen.flags & Screen_WrapNext)
1289 return;
1290
1291 /* fall through */
1292
1203 case 0: /* erase to end of line */ 1293 case 0: /* erase to end of line */
1204 col = screen.cur.col; 1294 col = screen.cur.col;
1205 num = ncol - col; 1295 num = ncol - col;
1206 min_it (line.l, col); 1296 min_it (line.l, col);
1297
1207 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1298 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1208 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1299 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1209 CLEAR_SELECTION (); 1300 CLEAR_SELECTION ();
1210 break; 1301 break;
1302
1211 case 1: /* erase to beginning of line */ 1303 case 1: /* erase to beginning of line */
1212 col = 0; 1304 col = 0;
1213 num = screen.cur.col + 1; 1305 num = screen.cur.col + 1;
1306
1214 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1307 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1215 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1308 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1216 CLEAR_SELECTION (); 1309 CLEAR_SELECTION ();
1217 break; 1310 break;
1311
1218 case 2: /* erase whole line */ 1312 case 2: /* erase whole line */
1219 col = 0; 1313 col = 0;
1220 num = ncol; 1314 num = ncol;
1221 line.l = 0; 1315 line.l = 0;
1222 if (selection.beg.row <= screen.cur.row 1316 if (selection.beg.row <= screen.cur.row
… …
1230 scr_blank_line (line, col, num, rstyle); 1324 scr_blank_line (line, col, num, rstyle);
1231} 1325}
1232 1326
1233/* ------------------------------------------------------------------------- */ 1327/* ------------------------------------------------------------------------- */
1234/* 1328/*
1235 * Erase part of whole of the screen 1329 * Erase part or whole of the screen
1236 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1330 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1237 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1331 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1238 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1332 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1239 */ 1333 */
1240void 1334void
1241rxvt_term::scr_erase_screen (int mode) 1335rxvt_term::scr_erase_screen (int mode) NOTHROW
1242{ 1336{
1243 int num; 1337 int num;
1244 int32_t row; 1338 int32_t row;
1245 rend_t ren; 1339 rend_t ren;
1246 XGCValues gcvalue; 1340 XGCValues gcvalue;
… …
1249 ZERO_SCROLLBACK (); 1343 ZERO_SCROLLBACK ();
1250 1344
1251 switch (mode) 1345 switch (mode)
1252 { 1346 {
1253 case 0: /* erase to end of screen */ 1347 case 0: /* erase to end of screen */
1254 selection_check (1);
1255 scr_erase_line (0); 1348 scr_erase_line (0);
1256 row = screen.cur.row + 1; /* possible OOB */ 1349 row = screen.cur.row + 1; /* possible OOB */
1257 num = nrow - row; 1350 num = nrow - row;
1258 break; 1351 break;
1259 case 1: /* erase to beginning of screen */ 1352 case 1: /* erase to beginning of screen */
1260 selection_check (3);
1261 scr_erase_line (1); 1353 scr_erase_line (1);
1262 row = 0; 1354 row = 0;
1263 num = screen.cur.row; 1355 num = screen.cur.row;
1264 break; 1356 break;
1265 case 2: /* erase whole screen */ 1357 case 2: /* erase whole screen */
1266 selection_check (3);
1267 row = 0; 1358 row = 0;
1268 num = nrow; 1359 num = nrow;
1269 break; 1360 break;
1270 default: 1361 default:
1271 return; 1362 return;
… …
1280 if (row >= nrow) /* Out Of Bounds */ 1371 if (row >= nrow) /* Out Of Bounds */
1281 return; 1372 return;
1282 1373
1283 min_it (num, nrow - row); 1374 min_it (num, nrow - row);
1284 1375
1285 if (rstyle & (RS_RVid | RS_Uline)) 1376 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1286 ren = (rend_t) ~RS_None; 1377 ren = (rend_t) ~RS_None;
1287 else if (GET_BASEBG (rstyle) == Color_bg) 1378 else if (GET_BASEBG (rstyle) == Color_bg)
1288 { 1379 {
1289 ren = DEFAULT_RSTYLE; 1380 ren = DEFAULT_RSTYLE;
1290 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);
1291 } 1386 }
1292 else 1387 else
1293 { 1388 {
1294 ren = rstyle & (RS_fgMask | RS_bgMask); 1389 ren = rstyle & (RS_fgMask | RS_bgMask);
1390
1391 if (mapped)
1392 {
1295 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1393 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1296 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1394 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1297 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));
1298 gcvalue.foreground = pix_colors[Color_fg]; 1399 gcvalue.foreground = pix_colors[Color_fg];
1299 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1400 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1401 }
1300 } 1402 }
1301 1403
1302 for (; num--; row++) 1404 for (; num--; row++)
1303 { 1405 {
1304 ROW (row).l = 0;
1305 scr_blank_screen_mem (ROW (row), rstyle); 1406 scr_blank_screen_mem (ROW(row), rstyle);
1407
1408 if (row - view_start < nrow)
1306 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1409 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1307 } 1410 }
1308} 1411}
1309 1412
1310#if ENABLE_FRILLS 1413#if !ENABLE_MINIMAL
1311void 1414void
1312rxvt_term::scr_erase_savelines () 1415rxvt_term::scr_erase_savelines () NOTHROW
1313{ 1416{
1314 want_refresh = 1; 1417 want_refresh = 1;
1315 ZERO_SCROLLBACK (); 1418 ZERO_SCROLLBACK ();
1316 1419
1317 nsaved = 0; 1420 top_row = 0;
1318} 1421}
1319#endif 1422#endif
1320 1423
1321/* ------------------------------------------------------------------------- */ 1424/* ------------------------------------------------------------------------- */
1322/* 1425/*
1323 * Fill the screen with `E's 1426 * Fill the screen with `E's
1324 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1427 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1325 */ 1428 */
1326void 1429void ecb_cold
1327rxvt_term::scr_E () 1430rxvt_term::scr_E () NOTHROW
1328{ 1431{
1329 rend_t fs; 1432 rend_t fs;
1330 1433
1331 want_refresh = 1; 1434 want_refresh = 1;
1332 ZERO_SCROLLBACK (); 1435 ZERO_SCROLLBACK ();
1333 1436
1334 num_scr_allow = 0; 1437 num_scr_allow = 0;
1335 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 ();
1336 1443
1337 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1444 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1338 for (int row = nrow; row--; ) 1445 for (int row = nrow; row--; )
1339 { 1446 {
1340 line_t &line = ROW(row); 1447 line_t &line = ROW(row);
… …
1343 rend_t *r1 = line.r; 1450 rend_t *r1 = line.r;
1344 1451
1345 for (int j = ncol; j--; ) 1452 for (int j = ncol; j--; )
1346 *r1++ = fs; 1453 *r1++ = fs;
1347 1454
1348 line.l = ncol; /* make the `E's selectable */ 1455 line.is_longer (0);
1456 line.touch (ncol);
1349 } 1457 }
1350} 1458}
1351 1459
1352/* ------------------------------------------------------------------------- */ 1460/* ------------------------------------------------------------------------- */
1353/* 1461/*
1354 * Insert/Delete <count> lines 1462 * Insert/Delete <count> lines
1355 */ 1463 */
1356void 1464void
1357rxvt_term::scr_insdel_lines (int count, int insdel) 1465rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1358{ 1466{
1359 int end; 1467 int end;
1360 1468
1361 ZERO_SCROLLBACK (); 1469 ZERO_SCROLLBACK ();
1362 1470
… …
1382/* ------------------------------------------------------------------------- */ 1490/* ------------------------------------------------------------------------- */
1383/* 1491/*
1384 * Insert/Delete <count> characters from the current position 1492 * Insert/Delete <count> characters from the current position
1385 */ 1493 */
1386void 1494void
1387rxvt_term::scr_insdel_chars (int count, int insdel) 1495rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1388{ 1496{
1389 int col, row;
1390 rend_t tr;
1391
1392 want_refresh = 1; 1497 want_refresh = 1;
1393 ZERO_SCROLLBACK (); 1498 ZERO_SCROLLBACK ();
1394 1499
1395 if (count <= 0) 1500 if (count <= 0)
1396 return; 1501 return;
… …
1398 scr_do_wrap (); 1503 scr_do_wrap ();
1399 1504
1400 selection_check (1); 1505 selection_check (1);
1401 min_it (count, ncol - screen.cur.col); 1506 min_it (count, ncol - screen.cur.col);
1402 1507
1403 row = screen.cur.row; 1508 int row = screen.cur.row;
1404 1509
1405 line_t *line = &ROW(row); 1510 line_t *line = &ROW(row);
1406 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
1407 switch (insdel) 1519 switch (insdel)
1408 { 1520 {
1409 case INSERT: 1521 case INSERT:
1410 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--)
1411 { 1528 {
1412 line->t[col] = line->t[col - count]; 1529 line->t[col] = line->t[col - count];
1413 line->r[col] = line->r[col - count]; 1530 line->r[col] = line->r[col - count];
1414 }
1415
1416 if (!line->is_longer ())
1417 {
1418 line->l += count;
1419 min_it (line->l, ncol);
1420 } 1531 }
1421 1532
1422 if (selection.op && current_screen == selection.screen 1533 if (selection.op && current_screen == selection.screen
1423 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1534 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1424 { 1535 {
1425 if (selection.end.row != screen.cur.row 1536 if (selection.end.row != screen.cur.row
1426 || (selection.end.col + count >= ncol)) 1537 || (selection.end.col + count >= ncol))
1427 CLEAR_SELECTION (); 1538 CLEAR_SELECTION ();
1428 else 1539 else
1540 {
1429 { /* shift selection */ 1541 /* shift selection */
1430 selection.beg.col += count; 1542 selection.beg.col += count;
1431 selection.mark.col += count; /* XXX: yes? */ 1543 selection.mark.col += count; /* XXX: yes? */
1432 selection.end.col += count; 1544 selection.end.col += count;
1433 } 1545 }
1434 } 1546 }
… …
1438 1550
1439 case ERASE: 1551 case ERASE:
1440 screen.cur.col += count; /* don't worry if > ncol */ 1552 screen.cur.col += count; /* don't worry if > ncol */
1441 selection_check (1); 1553 selection_check (1);
1442 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
1443 scr_blank_line (*line, screen.cur.col, count, rstyle); 1560 scr_blank_line (*line, screen.cur.col, count, rstyle);
1444 break; 1561 break;
1445 1562
1446 case DELETE: 1563 case DELETE:
1447 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1564 line->l = max (line->l - count, 0);
1448 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
1449 for (col = screen.cur.col; (col + count) < ncol; col++) 1570 for (int col = screen.cur.col; (col + count) < ncol; col++)
1450 { 1571 {
1451 line->t[col] = line->t[col + count]; 1572 line->t[col] = line->t[col + count];
1452 line->r[col] = line->r[col + count]; 1573 line->r[col] = line->r[col + count];
1453 } 1574 }
1454 1575
1455 scr_blank_line (*line, ncol - count, count, tr); 1576 scr_blank_line (*line, ncol - count, count, rstyle);
1456
1457 if (line->is_longer ()) /* break line continuation */
1458 line->l = ncol;
1459
1460 line->l = max (line->l - count, 0);
1461 1577
1462 if (selection.op && current_screen == selection.screen 1578 if (selection.op && current_screen == selection.screen
1463 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1579 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1464 { 1580 {
1465 if (selection.end.row != screen.cur.row 1581 if (selection.end.row != screen.cur.row
… …
1482/* ------------------------------------------------------------------------- */ 1598/* ------------------------------------------------------------------------- */
1483/* 1599/*
1484 * Set the scrolling region 1600 * Set the scrolling region
1485 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1601 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1486 */ 1602 */
1487void 1603void ecb_cold
1488rxvt_term::scr_scroll_region (int top, int bot) 1604rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1489{ 1605{
1490 max_it (top, 0); 1606 max_it (top, 0);
1491 min_it (bot, nrow - 1); 1607 min_it (bot, nrow - 1);
1492 1608
1493 if (top > bot) 1609 if (top > bot)
… …
1502/* 1618/*
1503 * Make the cursor visible/invisible 1619 * Make the cursor visible/invisible
1504 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1620 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1505 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1621 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1506 */ 1622 */
1507void 1623void ecb_cold
1508rxvt_term::scr_cursor_visible (int mode) 1624rxvt_term::scr_cursor_visible (int mode) NOTHROW
1509{ 1625{
1510 want_refresh = 1; 1626 want_refresh = 1;
1511 1627
1512 if (mode) 1628 if (mode)
1513 screen.flags |= Screen_VisibleCursor; 1629 screen.flags |= Screen_VisibleCursor;
… …
1519/* 1635/*
1520 * Set/unset automatic wrapping 1636 * Set/unset automatic wrapping
1521 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1637 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1522 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1638 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1523 */ 1639 */
1524void 1640void ecb_cold
1525rxvt_term::scr_autowrap (int mode) 1641rxvt_term::scr_autowrap (int mode) NOTHROW
1526{ 1642{
1527 if (mode) 1643 if (mode)
1528 screen.flags |= Screen_Autowrap; 1644 screen.flags |= Screen_Autowrap;
1529 else 1645 else
1530 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1646 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1538 * 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
1539 * and the cursor cannot be moved outside. 1655 * and the cursor cannot be moved outside.
1540 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1656 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1541 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1657 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1542 */ 1658 */
1543void 1659void ecb_cold
1544rxvt_term::scr_relative_origin (int mode) 1660rxvt_term::scr_relative_origin (int mode) NOTHROW
1545{ 1661{
1546 if (mode) 1662 if (mode)
1547 screen.flags |= Screen_Relative; 1663 screen.flags |= Screen_Relative;
1548 else 1664 else
1549 screen.flags &= ~Screen_Relative; 1665 screen.flags &= ~Screen_Relative;
… …
1555/* 1671/*
1556 * Set insert/replace mode 1672 * Set insert/replace mode
1557 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1673 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1558 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1674 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1559 */ 1675 */
1560void 1676void ecb_cold
1561rxvt_term::scr_insert_mode (int mode) 1677rxvt_term::scr_insert_mode (int mode) NOTHROW
1562{ 1678{
1563 if (mode) 1679 if (mode)
1564 screen.flags |= Screen_Insert; 1680 screen.flags |= Screen_Insert;
1565 else 1681 else
1566 screen.flags &= ~Screen_Insert; 1682 screen.flags &= ~Screen_Insert;
… …
1571 * Set/Unset tabs 1687 * Set/Unset tabs
1572 * XTERM_SEQ: Set tab at current column : ESC H 1688 * XTERM_SEQ: Set tab at current column : ESC H
1573 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1689 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1574 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1690 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1575 */ 1691 */
1576void 1692void ecb_cold
1577rxvt_term::scr_set_tab (int mode) 1693rxvt_term::scr_set_tab (int mode) NOTHROW
1578{ 1694{
1579 if (mode < 0) 1695 if (mode < 0)
1580 memset (tabs, 0, ncol * sizeof (char)); 1696 memset (tabs, 0, ncol);
1581 else if (screen.cur.col < ncol) 1697 else if (screen.cur.col < ncol)
1582 tabs[screen.cur.col] = (mode ? 1 : 0); 1698 tabs [screen.cur.col] = !!mode;
1583} 1699}
1584 1700
1585/* ------------------------------------------------------------------------- */ 1701/* ------------------------------------------------------------------------- */
1586/* 1702/*
1587 * Set reverse/normal video 1703 * Set reverse/normal video
1588 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1704 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1589 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1705 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1590 */ 1706 */
1591void 1707void
1592rxvt_term::scr_rvideo_mode (int mode) 1708rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1593{ 1709{
1594 XGCValues gcvalue; 1710 rvideo_mode = on;
1595 1711
1712#ifndef NO_BELL
1713 on ^= rvideo_bell;
1714#endif
1715
1596 if (rvideo != mode) 1716 if (rvideo_state != on)
1597 { 1717 {
1598 rvideo = mode; 1718 rvideo_state = on;
1719
1599 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1720 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1600#if XPM_BACKGROUND 1721#ifdef HAVE_IMG
1601 if (bgPixmap.pixmap == None) 1722 if (bg_img == 0)
1602#endif 1723#endif
1603#if TRANSPARENT 1724 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1604 if (! OPTION (Opt_transparent) || am_transparent == 0)
1605#endif
1606 XSetWindowBackground (display->display, vt,
1607 pix_colors[Color_bg]);
1608 1725
1726 XGCValues gcvalue;
1609 gcvalue.foreground = pix_colors[Color_fg]; 1727 gcvalue.foreground = pix_colors[Color_fg];
1610 gcvalue.background = pix_colors[Color_bg]; 1728 gcvalue.background = pix_colors[Color_bg];
1611 XChangeGC (display->display, gc, GCBackground | GCForeground, 1729 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1612 &gcvalue); 1730
1613 scr_clear (); 1731 scr_clear ();
1614 scr_touch (true); 1732 scr_touch (true);
1615 } 1733 }
1616} 1734}
1617 1735
1618/* ------------------------------------------------------------------------- */ 1736/* ------------------------------------------------------------------------- */
1619/* 1737/*
1620 * Report current cursor position 1738 * Report current cursor position
1621 * XTERM_SEQ: Report position: ESC [ 6 n 1739 * XTERM_SEQ: Report position: ESC [ 6 n
1622 */ 1740 */
1623void 1741void ecb_cold
1624rxvt_term::scr_report_position () 1742rxvt_term::scr_report_position () NOTHROW
1625{ 1743{
1626 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);
1627} 1745}
1628 1746
1629/* ------------------------------------------------------------------------- * 1747/* ------------------------------------------------------------------------- *
… …
1631 * ------------------------------------------------------------------------- */ 1749 * ------------------------------------------------------------------------- */
1632 1750
1633/* 1751/*
1634 * Set font style 1752 * Set font style
1635 */ 1753 */
1636void 1754void ecb_cold
1637rxvt_term::set_font_style () 1755rxvt_term::set_font_style () NOTHROW
1638{ 1756{
1757#if 0
1639 switch (charsets[screen.charset]) 1758 switch (charsets [screen.charset])
1640 { 1759 {
1641 case '0': /* DEC Special Character & Line Drawing Set */ 1760 case '0': /* DEC Special Character & Line Drawing Set */
1642 break; 1761 break;
1643 case 'A': /* United Kingdom (UK) */ 1762 case 'A': /* United Kingdom (UK) */
1644 break; 1763 break;
… …
1651 case 'C': /* Finnish character set */ 1770 case 'C': /* Finnish character set */
1652 break; 1771 break;
1653 case 'K': /* German character set */ 1772 case 'K': /* German character set */
1654 break; 1773 break;
1655 } 1774 }
1775#endif
1656} 1776}
1657 1777
1658/* ------------------------------------------------------------------------- */ 1778/* ------------------------------------------------------------------------- */
1659/* 1779/*
1660 * Choose a font 1780 * Choose a font
1661 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1781 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1662 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1782 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1663 * XTERM_SEQ: Invoke G2 character set: ESC N 1783 * XTERM_SEQ: Invoke G2 character set: ESC N
1664 * XTERM_SEQ: Invoke G3 character set: ESC O 1784 * XTERM_SEQ: Invoke G3 character set: ESC O
1665 */ 1785 */
1666void 1786void ecb_cold
1667rxvt_term::scr_charset_choose (int set) 1787rxvt_term::scr_charset_choose (int set) NOTHROW
1668{ 1788{
1669 screen.charset = set; 1789 screen.charset = set;
1670 set_font_style (); 1790 set_font_style ();
1671} 1791}
1672 1792
… …
1678 * XTERM_SEQ: Set G2 character set: ESC * <C> 1798 * XTERM_SEQ: Set G2 character set: ESC * <C>
1679 * XTERM_SEQ: Set G3 character set: ESC + <C> 1799 * XTERM_SEQ: Set G3 character set: ESC + <C>
1680 * See set_font_style for possible values for <C> 1800 * See set_font_style for possible values for <C>
1681 */ 1801 */
1682void 1802void
1683rxvt_term::scr_charset_set (int set, unsigned int ch) 1803rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1684{ 1804{
1685 charsets[set] = (unsigned char)ch; 1805 charsets[set] = (unsigned char)ch;
1686 set_font_style (); 1806 set_font_style ();
1687} 1807}
1688 1808
… …
1692 * ------------------------------------------------------------------------- */ 1812 * ------------------------------------------------------------------------- */
1693 1813
1694/* 1814/*
1695 * refresh matching text. 1815 * refresh matching text.
1696 */ 1816 */
1697bool 1817bool ecb_cold
1698rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1818rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1699{ 1819{
1700 bool found = false; 1820 bool found = false;
1701 1821
1702 for (int i = 0; i < nrow; i++) 1822 for (int i = 0; i < nrow; i++)
1703 { 1823 {
1704 int col = 0;
1705 rend_t *drp = drawn_buf[i].r; 1824 rend_t *drp = drawn_buf[i].r;
1706 1825
1707 for (; col < ncol; col++, drp++) 1826 for (int col = 0; col < ncol; col++, drp++)
1708 if ((*drp & mask) == value) 1827 if ((*drp & mask) == value)
1709 { 1828 {
1710 found = true; 1829 found = true;
1711 *drp = ~value; 1830 *drp = ~value;
1712 } 1831 }
… …
1722 PART_BEG = 0, 1841 PART_BEG = 0,
1723 PART_END, 1842 PART_END,
1724 RC_COUNT 1843 RC_COUNT
1725}; 1844};
1726 1845
1727void 1846void ecb_hot
1728rxvt_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
1729{ 1848{
1730 int i; 1849 int i;
1731 row_col_t rc[RC_COUNT]; 1850 row_col_t rc[RC_COUNT];
1732 1851
1733 if (!drawn_buf) /* sanity check */ 1852 if (!drawn_buf) /* sanity check */
… …
1756 } 1875 }
1757 1876
1758 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++)
1759 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);
1760 1879
1880 num_scr_allow = 0;
1881
1761 if (refresh) 1882 if (refresh)
1762 scr_refresh (SLOW_REFRESH); 1883 scr_refresh ();
1763} 1884}
1764 1885
1765/* ------------------------------------------------------------------------- */ 1886/* ------------------------------------------------------------------------- */
1766/* 1887/*
1767 * Refresh the entire screen 1888 * Refresh the entire screen
1768 */ 1889 */
1769void 1890void
1770rxvt_term::scr_touch (bool refresh) 1891rxvt_term::scr_touch (bool refresh) NOTHROW
1771{ 1892{
1772 scr_expose (0, 0, width, height, refresh); 1893 scr_expose (0, 0, vt_width, vt_height, refresh);
1773} 1894}
1774 1895
1775/* ------------------------------------------------------------------------- */ 1896/* ------------------------------------------------------------------------- */
1776/* 1897/*
1777 * 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
1778 * the top of the screen 1899 * the top of the screen
1779 */ 1900 */
1780int 1901void
1781rxvt_term::scr_move_to (int y, int len) 1902rxvt_term::scr_move_to (int y, int len) NOTHROW
1782{ 1903{
1783 long p = 0; 1904 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1784 unsigned int oldviewstart;
1785
1786 oldviewstart = view_start;
1787
1788 if (y < len)
1789 {
1790 p = (nrow + nsaved) * (len - y) / len;
1791 p -= (long) (nrow - 1);
1792 p = max (p, 0);
1793 }
1794
1795 view_start = (unsigned int)min (p, nsaved);
1796
1797 return scr_changeview (oldviewstart);
1798} 1905}
1799 1906
1800/* ------------------------------------------------------------------------- */ 1907/* ------------------------------------------------------------------------- */
1801/* 1908/*
1802 * Page the screen up/down nlines 1909 * Page the screen up/down nlines
1803 * direction should be UP or DN 1910 * direction should be UP or DN
1804 */ 1911 */
1805int 1912bool
1806rxvt_term::scr_page (enum page_dirn direction, int nlines) 1913rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1807{ 1914{
1808 int n; 1915 int new_view_start =
1809 unsigned int oldviewstart;
1810
1811 oldviewstart = view_start;
1812
1813 if (direction == UP)
1814 {
1815 n = view_start + nlines;
1816 view_start = min (n, nsaved);
1817 }
1818 else
1819 {
1820 n = view_start - nlines; 1916 direction == UP ? view_start - nlines
1821 view_start = max (n, 0); 1917 : view_start + nlines;
1822 }
1823 1918
1824 return scr_changeview (oldviewstart); 1919 return scr_changeview (new_view_start);
1825} 1920}
1826 1921
1827int 1922bool
1828rxvt_term::scr_changeview (unsigned int oldviewstart) 1923rxvt_term::scr_changeview (int new_view_start) NOTHROW
1829{ 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
1830 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));
1831 1935
1832 if (view_start != oldviewstart) 1936 return true;
1833 {
1834 want_refresh = 1;
1835 num_scr -= (view_start - oldviewstart);
1836 }
1837
1838 return (int) (view_start - oldviewstart);
1839} 1937}
1840 1938
1841/* ------------------------------------------------------------------------- */ 1939#ifndef NO_BELL
1842void 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
1843rxvt_term::scr_bell () 1951rxvt_term::scr_bell () NOTHROW
1844{ 1952{
1845#ifndef NO_BELL 1953#ifndef NO_BELL
1846 1954
1847# ifndef NO_MAPALERT 1955# ifndef NO_MAPALERT
1848# ifdef MAPALERT_OPTION 1956# ifdef MAPALERT_OPTION
1849 if (OPTION (Opt_mapAlert)) 1957 if (option (Opt_mapAlert))
1850# endif 1958# endif
1851 XMapWindow (display->display, parent[0]); 1959 XMapWindow (dpy, parent);
1852# endif 1960# endif
1853 1961
1962# if ENABLE_FRILLS
1963 if (option (Opt_urgentOnBell))
1964 set_urgency (1);
1965# endif
1966
1854 if (OPTION (Opt_visualBell)) 1967 if (option (Opt_visualBell))
1855 { 1968 {
1856 scr_rvideo_mode (!rvideo); /* refresh also done */ 1969 rvideo_bell = true;
1970 scr_rvideo_mode (rvideo_mode);
1971 flush ();
1972
1857 rxvt_usleep (VISUAL_BELL_DURATION); 1973 bell_ev.start (VISUAL_BELL_DURATION);
1858 scr_rvideo_mode (!rvideo); /* refresh also done */
1859 } 1974 }
1860 else 1975 else
1861 XBell (display->display, 0); 1976 XBell (dpy, 0);
1862 1977 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1863#endif 1978#endif
1864} 1979}
1865 1980
1866/* ------------------------------------------------------------------------- */ 1981/* ------------------------------------------------------------------------- */
1867/* ARGSUSED */ 1982void ecb_cold
1868void
1869rxvt_term::scr_printscreen (int fullhist) 1983rxvt_term::scr_printscreen (int fullhist) NOTHROW
1870{ 1984{
1871#ifdef PRINTPIPE 1985#ifdef PRINTPIPE
1872 int nrows, row_start; 1986 int nrows, row_start;
1873 FILE *fd; 1987 FILE *fd = popen_printer ();
1874 1988
1875 if ((fd = popen_printer ()) == NULL) 1989 if (!fd)
1876 return; 1990 return;
1877 1991
1878 if (fullhist) 1992 if (fullhist)
1879 { 1993 {
1880 nrows = nrow + nsaved; 1994 nrows = nrow - top_row;
1881 row_start = -nsaved; 1995 row_start = top_row;
1882 } 1996 }
1883 else 1997 else
1884 { 1998 {
1885 nrows = nrow; 1999 nrows = nrow;
1886 row_start = -view_start; 2000 row_start = view_start;
1887 } 2001 }
1888 2002
1889 wctomb (0, 0); 2003 wctomb (0, 0);
1890 2004
1891 for (int r1 = 0; r1 < nrows; r1++) 2005 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1892 { 2006 {
1893 text_t *tp = ROW(r1).t; 2007 text_t *tp = ROW(r1).t;
1894 int len = ROW(r1).l; 2008 int len = ROW(r1).l;
1895 2009
1896 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
… …
1922/* 2036/*
1923 * Refresh the screen 2037 * Refresh the screen
1924 * drawn_text/drawn_rend contain the screen information before the update. 2038 * drawn_text/drawn_rend contain the screen information before the update.
1925 * screen.text/screen.rend contain what the screen will change to. 2039 * screen.text/screen.rend contain what the screen will change to.
1926 */ 2040 */
1927void 2041void ecb_hot
1928rxvt_term::scr_refresh (unsigned char refresh_type) 2042rxvt_term::scr_refresh () NOTHROW
1929{ 2043{
1930 unsigned char must_clear, /* use draw_string not draw_image_string */
1931 showcursor; /* show the cursor */
1932 int16_t col, row, /* column/row we're processing */ 2044 int16_t col, row, /* column/row we're processing */
1933 ocrow; /* old cursor row */ 2045 ocrow; /* old cursor row */
1934 int i; /* tmp */ 2046 int i; /* tmp */
1935#ifndef NO_CURSORCOLOR 2047 rend_t ccol1, /* Cursor colour */
1936 rend_t cc1; /* store colours at cursor position (s) */ 2048 ccol2; /* Cursor colour2 */
1937#endif 2049 rend_t cur_rend;
1938 rend_t *crp; // cursor rendition pointer 2050 int cur_col;
1939 2051
1940 want_refresh = 0; /* screen is current */ 2052 want_refresh = 0; /* screen is current */
1941 2053
1942 if (refresh_type == NO_REFRESH || !mapped) 2054 if (refresh_type == NO_REFRESH || !mapped)
1943 return; 2055 return;
1944 2056
1945 /* 2057 /*
1946 * A: set up vars 2058 * A: set up vars
1947 */ 2059 */
1948 must_clear = 0;
1949 refresh_count = 0; 2060 refresh_count = 0;
1950 2061
1951#if XPM_BACKGROUND 2062 unsigned int old_screen_flags = screen.flags;
1952 must_clear |= bgPixmap.pixmap != None; 2063 bool have_bg = 0;
1953#endif 2064#ifdef HAVE_IMG
1954#if TRANSPARENT 2065 have_bg = bg_img != 0;
1955 must_clear |= OPTION (Opt_transparent) && am_transparent;
1956#endif 2066#endif
1957 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2067 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1958 2068
1959 /* 2069 /*
1960 * B: reverse any characters which are selected 2070 * B: reverse any characters which are selected
1961 */ 2071 */
1962 PERL_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
1963 scr_reverse_selection (); 2072 scr_reverse_selection ();
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;
1964 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#if ENABLE_OVERLAY
2054 scr_swap_overlay ();
2055#endif
2056 2172
2057#ifndef NO_SLOW_LINK_SUPPORT 2173#ifndef NO_SLOW_LINK_SUPPORT
2058 /* 2174 /*
2059 * D: CopyArea pass - very useful for slower links 2175 * D: CopyArea pass - very useful for slower links
2060 * This has been deliberately kept simple. 2176 * This has been deliberately kept simple.
2061 */ 2177 */
2062 i = num_scr;
2063 if (!display->is_local 2178 if (!display->is_local
2064 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2179 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2065 && abs (num_scr) < nrow && !must_clear) 2180 && abs (num_scr) < nrow && !have_bg)
2066 { 2181 {
2067 int16_t nits; 2182 int16_t nits;
2183 int i = num_scr;
2068 int j; 2184 int j;
2069 int len, wlen; 2185 int len, wlen;
2070 2186
2071 j = nrow; 2187 j = nrow;
2072 wlen = len = -1; 2188 wlen = len = -1;
2073 row = i > 0 ? 0 : j - 1; 2189 row = i > 0 ? 0 : j - 1;
2190
2074 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2191 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2075 { 2192 {
2076 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2193 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2077 { 2194 {
2078 line_t s = ROW(row - view_start); 2195 line_t s = ROW(view_start + row);
2079 line_t d = drawn_buf[row]; 2196 line_t d = drawn_buf[row];
2080 line_t d2 = drawn_buf[row + i]; 2197 line_t d2 = drawn_buf[row + i];
2081 2198
2082 for (nits = 0, col = ncol; col--; ) 2199 for (nits = 0, col = ncol; col--; )
2083 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])
… …
2099 wlen = row; 2216 wlen = row;
2100 continue; 2217 continue;
2101 } 2218 }
2102 } 2219 }
2103 2220
2104 if (len != -1) 2221 if (len >= 0)
2105 { 2222 {
2106 /* also comes here at end if needed because of >= above */ 2223 /* also comes here at end if needed because of >= above */
2107 if (wlen < len) 2224 if (wlen < len)
2108 ::swap (wlen, len); 2225 ::swap (wlen, len);
2109 2226
2227 XGCValues gcv;
2228
2229 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2110 XCopyArea (display->display, vt, vt, 2230 XCopyArea (dpy, vt, vt,
2111 gc, 0, Row2Pixel (len + i), 2231 gc, 0, Row2Pixel (len + i),
2112 (unsigned int)TermWin_TotalWidth (), 2232 (unsigned int)this->width,
2113 (unsigned int)Height2Pixel (wlen - len + 1), 2233 (unsigned int)Height2Pixel (wlen - len + 1),
2114 0, Row2Pixel (len)); 2234 0, Row2Pixel (len));
2235 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2236
2115 len = -1; 2237 len = -1;
2116 } 2238 }
2117 } 2239 }
2118 } 2240 }
2119#endif 2241#endif
… …
2121 /* 2243 /*
2122 * E: main pass across every character 2244 * E: main pass across every character
2123 */ 2245 */
2124 for (row = 0; row < nrow; row++) 2246 for (row = 0; row < nrow; row++)
2125 { 2247 {
2126 text_t *stp = ROW(row - view_start).t; 2248 text_t *stp = ROW(view_start + row).t;
2127 rend_t *srp = ROW(row - view_start).r; 2249 rend_t *srp = ROW(view_start + row).r;
2128 text_t *dtp = drawn_buf[row].t; 2250 text_t *dtp = drawn_buf[row].t;
2129 rend_t *drp = drawn_buf[row].r; 2251 rend_t *drp = drawn_buf[row].r;
2130 2252
2131 /* 2253 /*
2132 * E2: OK, now the real pass 2254 * E2: OK, now the real pass
… …
2143 continue; 2265 continue;
2144 2266
2145 // redraw one or more characters 2267 // redraw one or more characters
2146 2268
2147 // seek to the beginning of wide characters 2269 // seek to the beginning of wide characters
2148 while (stp[col] == NOCHAR && col > 0) 2270 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2149 --col; 2271 --col;
2150 2272
2151 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2273 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2152 text_t *text = stp + col; 2274 text_t *text = stp + col;
2153 int count = 1; 2275 int count = 1;
2154 2276
2155 dtp[col] = stp[col]; 2277 dtp[col] = stp[col];
2156 drp[col] = rend; 2278 drp[col] = rend;
… …
2160 for (i = 0; ++col < ncol; ) 2282 for (i = 0; ++col < ncol; )
2161 { 2283 {
2162 if (stp[col] == NOCHAR) 2284 if (stp[col] == NOCHAR)
2163 { 2285 {
2164 dtp[col] = stp[col]; 2286 dtp[col] = stp[col];
2165 drp[col] = rend; 2287 drp[col] = srp[col];
2288
2166 count++; 2289 count++;
2167 i++; 2290 i++;
2168 2291
2169 continue; 2292 continue;
2170 } 2293 }
… …
2175 count++; 2298 count++;
2176 2299
2177 if (stp[col] != dtp[col] 2300 if (stp[col] != dtp[col]
2178 || !RS_SAME (srp[col], drp[col])) 2301 || !RS_SAME (srp[col], drp[col]))
2179 { 2302 {
2180 if (must_clear && (i++ > count / 2)) 2303 if (have_bg && (i++ > count / 2))
2181 break; 2304 break;
2182 2305
2183 dtp[col] = stp[col]; 2306 dtp[col] = stp[col];
2184 drp[col] = rend; 2307 drp[col] = rend;
2185 i = 0; 2308 i = 0;
2186 } 2309 }
2187 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2310 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2188 break; 2311 break;
2189 } 2312 }
2190 2313
2191 col--; /* went one too far. move back */ 2314 col--; /* went one too far. move back */
2192 count -= i; /* dump any matching trailing chars */ 2315 count -= i; /* dump any matching trailing chars */
2193 2316
2194 // sometimes we optimize away the trailing NOCHAR's, add them back 2317 // sometimes we optimize away the trailing NOCHAR's, add them back
2195 while (i && text[count] == NOCHAR) 2318 while (ecb_unlikely (i && text[count] == NOCHAR))
2196 count++, i--; 2319 count++, i--;
2197 2320
2198 /* 2321 /*
2199 * Determine the attributes for the string 2322 * Determine the attributes for the string
2200 */ 2323 */
2201 int fore = fgcolor_of (rend); // desired foreground 2324 int fore = fgcolor_of (rend); // desired foreground
2202 int back = bgcolor_of (rend); // desired background 2325 int back = bgcolor_of (rend); // desired background
2203 2326
2204 // 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
2205 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)))
2206 { 2329 {
2207#if ENABLE_STYLES
2208 // force redraw after "careful" characters to avoid pixel droppings
2209 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2210 drp[col + 1] = ~srp[col + 1];
2211
2212 // include previous careful character(s) if possible, looks nicer (best effort...)
2213 while (text > stp
2214 && srp[text - stp - 1] & RS_Careful
2215 && RS_SAME (rend, srp[text - stp - 1]))
2216 text--, count++, xpixel -= fwidth;
2217#endif
2218
2219 bool invert = rend & RS_RVid; 2330 bool invert = rend & RS_RVid;
2220 2331
2221#ifndef NO_BOLD_UNDERLINE_REVERSE 2332#ifndef NO_BOLD_UNDERLINE_REVERSE
2222 if (rend & RS_Bold
2223 && fore == Color_fg) 2333 if (rend & RS_Bold && fore == Color_fg)
2224 { 2334 {
2225 if (ISSET_PIXCOLOR (Color_BD)) 2335 if (ISSET_PIXCOLOR (Color_BD))
2226 fore = Color_BD; 2336 fore = Color_BD;
2227# if !ENABLE_STYLES 2337# if !ENABLE_STYLES
2228 else 2338 else
2229 invert = !invert; 2339 invert = !invert;
2230# endif 2340# endif
2231 } 2341 }
2232 2342
2233 if (rend & RS_Italic 2343 if (rend & RS_Italic && fore == Color_fg)
2234 && fore == Color_fg)
2235 { 2344 {
2236 if (ISSET_PIXCOLOR (Color_IT)) 2345 if (ISSET_PIXCOLOR (Color_IT))
2237 fore = Color_IT; 2346 fore = Color_IT;
2238# if !ENABLE_STYLES 2347# if !ENABLE_STYLES
2239 else 2348 else
2240 invert = !invert; 2349 invert = !invert;
2241# endif 2350# endif
2242 } 2351 }
2243 2352
2244 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2353 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2245 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 }
2246#endif 2375#endif
2247 2376
2248 if (invert) 2377 if (invert)
2249 { 2378 {
2250 ::swap (fore, back); 2379 ::swap (fore, back);
2251 2380
2252#ifndef NO_BOLD_UNDERLINE_REVERSE 2381#ifndef NO_BOLD_UNDERLINE_REVERSE
2253 if (ISSET_PIXCOLOR (Color_RV))
2254 back = Color_RV;
2255
2256 if (fore == back) 2382 if (fore == back)
2257 { 2383 {
2258 fore = Color_bg; 2384 fore = Color_bg;
2259 back = Color_fg; 2385 back = Color_fg;
2260 } 2386 }
… …
2262 } 2388 }
2263 2389
2264#ifdef TEXT_BLINK 2390#ifdef TEXT_BLINK
2265 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2391 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2266 { 2392 {
2267 if (!text_blink_ev.active) 2393 if (!text_blink_ev.is_active ())
2268 { 2394 {
2269 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2395 text_blink_ev.again ();
2270 hidden_text = 0; 2396 hidden_text = 0;
2271 } 2397 }
2272 else if (hidden_text) 2398 else if (hidden_text)
2273 fore = back; 2399 fore = back;
2274 } 2400 }
2275#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
2276 } 2420 }
2277 2421
2278 /* 2422 /*
2279 * Actually do the drawing of the string here 2423 * Actually do the drawing of the string here
2280 */ 2424 */
2281 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2425 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2282 2426
2283 if (back == fore) 2427 if (ecb_likely (have_bg && back == Color_bg))
2284 font->clear_rect (*drawable, xpixel, ypixel,
2285 fwidth * count, fheight,
2286 back);
2287 else if (back == Color_bg)
2288 { 2428 {
2289 if (must_clear) 2429 // this is very ugly, maybe push it into ->draw?
2290 {
2291 CLEAR_CHARS (xpixel, ypixel, count);
2292 2430
2293 for (i = 0; i < count; i++) /* don't draw empty strings */ 2431 for (i = 0; i < count; i++) /* don't draw empty strings */
2294 if (text[i] != ' ') 2432 if (text[i] != ' ')
2295 { 2433 {
2296 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2434 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2297 break; 2435 goto did_clear;
2298 }
2299 } 2436 }
2300 else 2437
2301 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2438 CLEAR_CHARS (xpixel, ypixel, count);
2439 did_clear: ;
2302 } 2440 }
2303 else 2441 else
2304 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2442 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2305 2443
2306 if (rend & RS_Uline && font->descent > 1 && fore != back) 2444 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2307 { 2445 {
2308#if ENABLE_FRILLS 2446#if ENABLE_FRILLS
2309 if (ISSET_PIXCOLOR (Color_underline)) 2447 if (ISSET_PIXCOLOR (Color_underline))
2310 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2448 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2311 else 2449 else
2312#endif 2450#endif
2313 XSetForeground (display->display, gc, pix_colors[fore]); 2451 XSetForeground (dpy, gc, pix_colors[fore]);
2314 2452
2315 XDrawLine (display->display, drawBuffer, gc, 2453 XDrawLine (dpy, vt, gc,
2316 xpixel, ypixel + font->ascent + 1, 2454 xpixel, ypixel + font->ascent + 1,
2317 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2455 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2318 } 2456 }
2319 } /* for (col....) */ 2457 } /* for (col....) */
2320 } /* for (row....) */ 2458 } /* for (row....) */
2321 2459
2322#if ENABLE_OVERLAY
2323 scr_swap_overlay ();
2324#endif
2325
2326 /* 2460 /*
2327 * G: cleanup cursor and display outline cursor if necessary 2461 * G: cleanup cursor and display outline cursor if necessary
2328 */ 2462 */
2329 if (showcursor) 2463 if (showcursor)
2330 { 2464 {
2331 if (focus) 2465 if (focus)
2332 { 2466 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2333 if (OPTION (Opt_cursorUnderline))
2334 *crp ^= RS_Uline;
2335 else
2336 {
2337 *crp ^= RS_RVid;
2338#ifndef NO_CURSORCOLOR
2339 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2340#endif
2341 }
2342 }
2343 else if (oldcursor.row >= 0) 2467 else if (oldcursor.row >= 0)
2344 { 2468 {
2345 int cursorwidth = 1; 2469 int cursorwidth = 1;
2346 int col = oldcursor.col; 2470 int col = oldcursor.col;
2347 2471
… …
2352 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2476 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2353 cursorwidth++; 2477 cursorwidth++;
2354 2478
2355#ifndef NO_CURSORCOLOR 2479#ifndef NO_CURSORCOLOR
2356 if (ISSET_PIXCOLOR (Color_cursor)) 2480 if (ISSET_PIXCOLOR (Color_cursor))
2357 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2481 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2482 else
2358#endif 2483#endif
2484 XSetForeground (dpy, gc, pix_colors[ccol1]);
2359 2485
2360 XDrawRectangle (display->display, drawBuffer, gc, 2486 XDrawRectangle (dpy, vt, gc,
2361 Col2Pixel (col), 2487 Col2Pixel (col),
2362 Row2Pixel (oldcursor.row), 2488 Row2Pixel (oldcursor.row),
2363 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2489 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2364 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2490 (unsigned int) (Height2Pixel (1) - 1));
2365 } 2491 }
2366 } 2492 }
2367 2493
2368 /* 2494 /*
2369 * H: cleanup selection 2495 * H: cleanup selection
2370 */ 2496 */
2497#if ENABLE_OVERLAY
2498 scr_swap_overlay ();
2499#endif
2500 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2501
2371 scr_reverse_selection (); 2502 scr_reverse_selection ();
2372 PERL_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2373 2503
2374 if (refresh_type & SMOOTH_REFRESH) 2504 screen.flags = old_screen_flags;
2375 XFlush (display->display);
2376
2377 num_scr = 0; 2505 num_scr = 0;
2378 num_scr_allow = 1; 2506 num_scr_allow = 1;
2379} 2507}
2380 2508
2381void 2509void ecb_cold
2382rxvt_term::scr_remap_chars (const line_t &l) 2510rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2383{ 2511{
2384 if (!l.t) 2512 if (!l.valid ())
2385 return; 2513 return;
2514
2515 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2386 2516
2387 for (int i = ncol; i--; ) 2517 for (int i = ncol; i--; )
2388 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]));
2389} 2519}
2390 2520
2391void 2521void ecb_cold
2392rxvt_term::scr_remap_chars () 2522rxvt_term::scr_remap_chars () NOTHROW
2393{ 2523{
2394 for (int i = total_rows; i--; ) 2524 for (int i = total_rows; i--; )
2395 scr_remap_chars (row_buf [i]); 2525 scr_remap_chars (row_buf [i]);
2396 2526
2397 for (int i = nrow; i--; ) 2527 for (int i = nrow; i--; )
… …
2399 scr_remap_chars (drawn_buf [i]); 2529 scr_remap_chars (drawn_buf [i]);
2400 scr_remap_chars (swap_buf [i]); 2530 scr_remap_chars (swap_buf [i]);
2401 } 2531 }
2402} 2532}
2403 2533
2404void 2534void ecb_cold
2405rxvt_term::scr_recolour () 2535rxvt_term::scr_recolour (bool refresh) NOTHROW
2406{ 2536{
2407 if (1 2537 bool transparent = false;
2408#if TRANSPARENT 2538
2409 && !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
2410#endif 2551# endif
2411#if XPM_BACKGROUND
2412 && !bgPixmap.pixmap
2413#endif
2414 ) 2552 {
2553 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2554 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2555 }
2415 { 2556 }
2557 else
2558#endif
2559 {
2416 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2560 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2417 XClearWindow (display->display, parent[0]);
2418 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2561 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2419#if HAVE_SCROLLBARS 2562 }
2563
2564 XClearWindow (dpy, parent);
2565
2420 if (scrollBar.win) 2566 if (scrollBar.win)
2421 { 2567 {
2568 if (transparent)
2569 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2570 else
2422 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2571 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2423 scrollBar.setIdle (); 2572 scrollBar.state = SB_STATE_IDLE;
2424 scrollbar_show (0); 2573 scrollBar.show (0);
2425 } 2574 }
2426#endif 2575
2576 if (refresh)
2427 } 2577 {
2428
2429 scr_clear (); 2578 scr_clear ();
2430 scr_touch (true); 2579 scr_touch (true);
2580 }
2431 want_refresh = 1; 2581 want_refresh = 1;
2432} 2582}
2433 2583
2434/* ------------------------------------------------------------------------- */ 2584/* ------------------------------------------------------------------------- */
2435void 2585void
2436rxvt_term::scr_clear (bool really) 2586rxvt_term::scr_clear (bool really) NOTHROW
2437{ 2587{
2438 if (!mapped) 2588 if (!mapped)
2439 return; 2589 return;
2440 2590
2441 num_scr_allow = 0; 2591 num_scr_allow = 0;
2442 want_refresh = 1; 2592 want_refresh = 1;
2443 2593
2444 if (really) 2594 if (really)
2445 XClearWindow (display->display, vt); 2595 XClearWindow (dpy, vt);
2446} 2596}
2447 2597
2448/* ------------------------------------------------------------------------- */
2449void 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
2450rxvt_term::scr_reverse_selection () 2648rxvt_term::scr_reverse_selection () NOTHROW
2451{ 2649{
2452 if (selection.op 2650 if (selection.op
2453 && current_screen == selection.screen 2651 && current_screen == selection.screen
2454 && selection.end.row >= -view_start) 2652 && selection.end.row >= view_start)
2455 { 2653 {
2456 int view_end = -view_start + nrow; 2654#if !ENABLE_MINIMAL
2457 int row, col;
2458
2459#if ENABLE_FRILLS
2460 if (selection.rect) 2655 if (selection.rect)
2461 { 2656 scr_xor_rect (selection.beg.row, selection.beg.col,
2462 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2657 selection.end.row, selection.end.col,
2463 { 2658 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2464 text_t *stp = ROW(row).t;
2465 rend_t *srp = ROW(row).r;
2466
2467 for (col = selection.beg.col; col < selection.end.col; col++)
2468 srp[col] ^= RS_RVid;
2469
2470 while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2471 srp[col] ^= RS_RVid | RS_Uline;
2472
2473 if (++col < selection.end.col)
2474 srp[col] ^= RS_RVid | RS_Uline;
2475 }
2476 }
2477 else 2659 else
2478#endif 2660#endif
2479 { 2661 scr_xor_span (selection.beg.row, selection.beg.col,
2480 if (selection.beg.row >= -view_start) 2662 selection.end.row, selection.end.col,
2481 { 2663 RS_Sel | RS_RVid);
2482 col = selection.beg.col;
2483 row = selection.beg.row;
2484 }
2485 else
2486 {
2487 col = 0;
2488 row = -view_start;
2489 }
2490
2491 for (; row < min (selection.end.row, view_end); row++, col = 0)
2492 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2493 srp[col] ^= RS_RVid;
2494
2495 if (row == selection.end.row)
2496 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2497 srp[col] ^= RS_RVid;
2498 }
2499 } 2664 }
2500} 2665}
2501 2666
2502/* ------------------------------------------------------------------------- */ 2667/* ------------------------------------------------------------------------- */
2503/* 2668/*
2504 * Dump the whole scrollback and screen to the passed filedescriptor. The 2669 * Dump the whole scrollback and screen to the passed filedescriptor. The
2505 * invoking routine must close the fd. 2670 * invoking routine must close the fd.
2506 */ 2671 */
2507#if 0 2672#if 0
2508void 2673void
2509rxvt_term::scr_dump (int fd) 2674rxvt_term::scr_dump (int fd) NOTHROW
2510{ 2675{
2511 int row, wrote; 2676 // if this method is needed, it can be implemented by factoring the
2512 unsigned int width, towrite; 2677 // relevant code in scr_printscreen
2513 char r1[] = "\n";
2514
2515 for (row = saveLines - nsaved;
2516 row < saveLines + nrow - 1; row++)
2517 {
2518 width = row_buf[row].l >= 0 ? row_buf[row].l
2519 : ncol;
2520 for (towrite = width; towrite; towrite -= wrote)
2521 {
2522 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2523 towrite);
2524 if (wrote < 0)
2525 return; /* XXX: death, no report */
2526 }
2527 if (row_buf[row].l >= 0)
2528 if (write (fd, r1, 1) <= 0)
2529 return; /* XXX: death, no report */
2530 }
2531} 2678}
2532#endif 2679#endif
2533 2680
2534/* ------------------------------------------------------------------------- * 2681/* ------------------------------------------------------------------------- *
2535 * CHARACTER SELECTION * 2682 * CHARACTER SELECTION *
2536 * ------------------------------------------------------------------------- */ 2683 * ------------------------------------------------------------------------- */
2537void 2684void
2538rxvt_term::selection_check (int check_more) 2685rxvt_term::selection_check (int check_more) NOTHROW
2539{ 2686{
2540 row_col_t pos;
2541
2542 if (!selection.op) 2687 if (!selection.op)
2543 return; 2688 return;
2544 2689
2545 pos.row = pos.col = 0;
2546 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2690 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2547 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2691 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2548 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2692 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2549 || (check_more == 1 2693 || (check_more == 1
2550 && current_screen == selection.screen 2694 && current_screen == selection.screen
2551 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2695 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2552 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2696 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2553 || (check_more == 2
2554 && ROWCOL_IS_BEFORE (selection.beg, pos)
2555 && ROWCOL_IS_AFTER (selection.end, pos))
2556 || (check_more == 3
2557 && ROWCOL_IS_AFTER (selection.end, pos))
2558 || (check_more == 4 /* screen width change */
2559 && (selection.beg.row != selection.end.row
2560 || selection.end.col > ncol)))
2561 CLEAR_SELECTION (); 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;
2562} 2712}
2563 2713
2564/* ------------------------------------------------------------------------- */ 2714/* ------------------------------------------------------------------------- */
2565/* 2715/*
2566 * Paste a selection direct to the command fd 2716 * Paste a selection direct to the command fd
2567 */ 2717 */
2568void 2718void
2569rxvt_term::paste (unsigned char *data, unsigned int len) 2719rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2570{ 2720{
2571 /* convert normal newline chars into common keyboard Return key sequence */ 2721 /* convert normal newline chars into common keyboard Return key sequence */
2572 for (unsigned int i = 0; i < len; i++) 2722 for (unsigned int i = 0; i < len; i++)
2573 if (data[i] == C0_LF) 2723 if (data[i] == C0_LF)
2574 data[i] = C0_CR; 2724 data[i] = C0_CR;
2575 2725
2726 if (priv_modes & PrivMode_BracketPaste)
2727 tt_printf ("\x1b[200~");
2728
2576 tt_write (data, len); 2729 tt_write (data, len);
2577}
2578 2730
2579/* ------------------------------------------------------------------------- */ 2731 if (priv_modes & PrivMode_BracketPaste)
2580/* 2732 tt_printf ("\x1b[201~");
2581 * Respond to a notification that a primary selection has been sent
2582 * EXT: SelectionNotify
2583 */
2584void
2585rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2586{
2587 if (prop == None) /* check for failed XConvertSelection */
2588 {
2589 if ((selection_type & Sel_CompoundText))
2590 {
2591 int selnum = selection_type & Sel_whereMask;
2592
2593 selection_type = 0;
2594 if (selnum != Sel_direct)
2595 selection_request_other (XA_STRING, selnum);
2596 }
2597
2598 if ((selection_type & Sel_UTF8String))
2599 {
2600 int selnum = selection_type & Sel_whereMask;
2601
2602 selection_type = Sel_CompoundText;
2603 if (selnum != Sel_direct)
2604 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2605 else
2606 selection_type = 0;
2607 }
2608
2609 return;
2610 }
2611
2612 unsigned long bytes_after;
2613 XTextProperty ct;
2614
2615 if (XGetWindowProperty (display->display, win, prop,
2616 0, PROP_SIZE / 4,
2617 delete_prop, AnyPropertyType,
2618 &ct.encoding, &ct.format,
2619 &ct.nitems, &bytes_after,
2620 &ct.value) != Success)
2621 {
2622 ct.value = 0;
2623 goto bailout;
2624 }
2625
2626 if (ct.encoding == None)
2627 goto bailout;
2628
2629 if (bytes_after)
2630 {
2631 // fetch and append remaining data
2632 XTextProperty ct2;
2633
2634 if (XGetWindowProperty (display->display, win, prop,
2635 ct.nitems / 4, (bytes_after + 3) / 4,
2636 delete_prop, AnyPropertyType,
2637 &ct2.encoding, &ct2.format,
2638 &ct2.nitems, &bytes_after,
2639 &ct2.value) != Success)
2640 goto bailout;
2641
2642 // realloc should be compatible to XFree, here, and elsewhere, too
2643 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2644 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2645 ct.nitems += ct2.nitems;
2646
2647 XFree (ct2.value);
2648 }
2649
2650 if (ct.value == 0)
2651 goto bailout;
2652
2653 if (ct.encoding == xa[XA_INCR])
2654 {
2655 // INCR selection, start handshake
2656 if (!delete_prop)
2657 XDeleteProperty (display->display, win, prop);
2658
2659 selection_wait = Sel_incr;
2660 incr_buf_fill = 0;
2661 incr_ev.start (NOW + 10);
2662
2663 goto bailout;
2664 }
2665
2666 if (ct.nitems == 0)
2667 {
2668 if (selection_wait == Sel_incr)
2669 {
2670 XFree (ct.value);
2671
2672 // finally complete, now paste the whole thing
2673 selection_wait = Sel_normal;
2674 ct.value = (unsigned char *)incr_buf;
2675 ct.nitems = incr_buf_fill;
2676 incr_buf = 0;
2677 incr_buf_size = 0;
2678 incr_ev.stop ();
2679 }
2680 else
2681 {
2682 if (selection_wait == Sel_normal
2683 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2684 {
2685 /*
2686 * pass through again trying CUT_BUFFER0 if we've come from
2687 * XConvertSelection () but nothing was presented
2688 */
2689 selection_paste (display->root, XA_CUT_BUFFER0, False);
2690 }
2691
2692 goto bailout;
2693 }
2694 }
2695 else if (selection_wait == Sel_incr)
2696 {
2697 incr_ev.start (NOW + 10);
2698
2699 while (incr_buf_fill + ct.nitems > incr_buf_size)
2700 {
2701 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2702 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2703 }
2704
2705 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2706 incr_buf_fill += ct.nitems;
2707
2708 goto bailout;
2709 }
2710
2711 char **cl;
2712 int cr;
2713
2714#if ENABLE_FRILLS
2715 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2716 // so recode it manually
2717 if (ct.encoding == xa[XA_UTF8_STRING])
2718 {
2719 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2720 char *s = rxvt_wcstombs (w);
2721 free (w);
2722 // TODO: strlen == only the first element will be converted. well...
2723 paste ((unsigned char *)s, strlen (s));
2724 free (s);
2725 }
2726 else
2727#endif
2728 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2729 && cl)
2730 {
2731 for (int i = 0; i < cr; i++)
2732 paste ((unsigned char *)cl[i], strlen (cl[i]));
2733
2734 XFreeStringList (cl);
2735 }
2736 else
2737 paste (ct.value, ct.nitems); // paste raw
2738
2739bailout:
2740 XFree (ct.value);
2741
2742 if (selection_wait == Sel_normal)
2743 selection_wait = Sel_none;
2744} 2733}
2745 2734
2746void 2735void
2747rxvt_term::incr_cb (time_watcher &w) 2736rxvt_term::paste (char *data, unsigned int len) NOTHROW
2748{ 2737{
2749 selection_wait = Sel_none; 2738 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2750
2751 incr_buf_size = 0;
2752 free (incr_buf);
2753
2754 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2755}
2756
2757void
2758rxvt_term::selection_property (Window win, Atom prop)
2759{
2760 if (prop == None || selection_wait != Sel_incr)
2761 return; 2739 return;
2762 2740
2763 selection_paste (win, prop, true); 2741 tt_paste (data, len);
2764} 2742}
2765 2743
2766/* ------------------------------------------------------------------------- */ 2744/* ------------------------------------------------------------------------- */
2767/* 2745/*
2768 * Request the current selection: 2746 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2769 * Order: > internal selection if available 2747 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2770 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2748 * as fallback
2771 * > CUT_BUFFER0
2772 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2773 * will auto fallback to CUT_BUFFER0
2774 * EXT: button 2 release 2749 * EXT: button 2 release
2775 */ 2750 */
2776void 2751void
2777rxvt_term::selection_request (Time tm, int x, int y) 2752rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2778{ 2753{
2779 if (x < 0 || x >= width || y < 0 || y >= height)
2780 return; /* outside window */
2781
2782 if (selection.text) 2754 if (!selection_req)
2783 { /* internal selection */
2784 char *str = rxvt_wcstombs (selection.text, selection.len);
2785 paste ((unsigned char *)str, strlen (str));
2786 free (str);
2787 return;
2788 } 2755 {
2789 else 2756 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2757 selection_req->run ();
2790 { 2758 }
2791 int i;
2792
2793 selection_request_time = tm;
2794 selection_wait = Sel_normal;
2795
2796 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2797 {
2798#if X_HAVE_UTF8_STRING
2799 selection_type = Sel_UTF8String;
2800 if (selection_request_other (xa[XA_UTF8_STRING], i))
2801 return;
2802#else
2803 selection_type = Sel_CompoundText;
2804 if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
2805 return;
2806#endif
2807 }
2808 }
2809
2810 selection_wait = Sel_none; /* don't loop in selection_paste () */
2811 selection_paste (display->root, XA_CUT_BUFFER0, false);
2812}
2813
2814int
2815rxvt_term::selection_request_other (Atom target, int selnum)
2816{
2817 Atom sel;
2818
2819 selection_type |= selnum;
2820
2821 if (selnum == Sel_Primary)
2822 sel = XA_PRIMARY;
2823 else if (selnum == Sel_Secondary)
2824 sel = XA_SECONDARY;
2825 else
2826 sel = xa[XA_CLIPBOARD];
2827
2828 if (XGetSelectionOwner (display->display, sel) != None)
2829 {
2830 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2831 vt, selection_request_time);
2832 return 1;
2833 }
2834
2835 return 0;
2836} 2759}
2837 2760
2838/* ------------------------------------------------------------------------- */ 2761/* ------------------------------------------------------------------------- */
2839/* 2762/*
2840 * Clear all selected text 2763 * Clear all selected text
2841 * EXT: SelectionClear 2764 * EXT: SelectionClear
2842 */ 2765 */
2843void 2766void
2844rxvt_term::selection_clear () 2767rxvt_term::selection_clear (bool clipboard) NOTHROW
2845{ 2768{
2769 if (!clipboard)
2770 {
2846 want_refresh = 1; 2771 want_refresh = 1;
2847 free (selection.text); 2772 free (selection.text);
2848 selection.text = NULL; 2773 selection.text = NULL;
2849 selection.len = 0; 2774 selection.len = 0;
2850 CLEAR_SELECTION (); 2775 CLEAR_SELECTION ();
2851 2776
2852 if (display->selection_owner == this) 2777 if (display->selection_owner == this)
2853 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 }
2854} 2789}
2855 2790
2856/* ------------------------------------------------------------------------- */ 2791/* ------------------------------------------------------------------------- */
2857/* 2792/*
2858 * Copy a selection into the cut buffer 2793 * Copy a selection into the cut buffer
2859 * EXT: button 1 or 3 release 2794 * EXT: button 1 or 3 release
2860 */ 2795 */
2861void 2796void
2862rxvt_term::selection_make (Time tm) 2797rxvt_term::selection_make (Time tm)
2863{ 2798{
2864 int i; 2799 int size;
2865 wchar_t *new_selection_text; 2800 wchar_t *new_selection_text;
2866 text_t *t; 2801 text_t *t;
2867 2802
2868 switch (selection.op) 2803 switch (selection.op)
2869 { 2804 {
… …
2882 selection.op = SELECTION_DONE; 2817 selection.op = SELECTION_DONE;
2883 2818
2884 if (selection.clicks == 4) 2819 if (selection.clicks == 4)
2885 return; /* nothing selected, go away */ 2820 return; /* nothing selected, go away */
2886 2821
2887 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)))
2888 return; 2823 return;
2889 2824
2890 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2825 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2891 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));
2892 2827
2893 int ofs = 0; 2828 int ofs = 0;
2894 int extra = 0; 2829 int extra = 0;
2895 2830
2896 int col = selection.beg.col; 2831 int col = selection.beg.col;
… …
2898 2833
2899 int end_col; 2834 int end_col;
2900 2835
2901 for (; row <= selection.end.row; row++, col = 0) 2836 for (; row <= selection.end.row; row++, col = 0)
2902 { 2837 {
2903#if ENABLE_FRILLS 2838#if !ENABLE_MINIMAL
2904 if (selection.rect) 2839 if (selection.rect)
2905 { 2840 {
2906 col = selection.beg.col; 2841 col = selection.beg.col;
2907 end_col = ncol + 1; 2842 end_col = selection.end.col;
2908 } 2843 }
2909 else 2844 else
2910#endif 2845#endif
2911 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2846 end_col = ROW(row).l;
2912 2847
2913 col = max (col, 0); 2848 col = max (col, 0);
2914 2849
2915 if (row == selection.end.row 2850 if (row == selection.end.row)
2916#if ENABLE_FRILLS
2917 || selection.rect
2918#endif
2919 )
2920 min_it (end_col, selection.end.col); 2851 min_it (end_col, selection.end.col);
2921 2852
2922 t = ROW(row).t + col; 2853 t = ROW(row).t + col;
2854
2923 for (; col < end_col; col++) 2855 for (; col < end_col; col++)
2924 { 2856 {
2925 if (*t == NOCHAR) 2857 if (*t == NOCHAR)
2926 t++; 2858 t++;
2927#if ENABLE_COMBINING 2859#if ENABLE_COMBINING
… …
2931 2863
2932 extra -= (len - 1); 2864 extra -= (len - 1);
2933 2865
2934 if (extra < 0) 2866 if (extra < 0)
2935 { 2867 {
2936 extra += i; 2868 extra += size;
2937 i += i; 2869 size += size;
2938 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));
2939 } 2871 }
2940 2872
2941 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2873 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
2942 } 2874 }
2943#endif 2875#endif
2944 else 2876 else
2945 new_selection_text[ofs++] = *t++; 2877 new_selection_text[ofs++] = *t++;
2946 } 2878 }
2947 2879
2948#if ENABLE_FRILLS 2880#if !ENABLE_MINIMAL
2949 if (selection.rect) 2881 if (selection.rect)
2950 { 2882 {
2951 while (ofs 2883 while (ofs
2952 && new_selection_text[ofs - 1] != C0_LF 2884 && new_selection_text[ofs - 1] != C0_LF
2953 && unicode::is_space (new_selection_text[ofs - 1])) 2885 && unicode::is_space (new_selection_text[ofs - 1]))
… …
2955 2887
2956 new_selection_text[ofs++] = C0_LF; 2888 new_selection_text[ofs++] = C0_LF;
2957 } 2889 }
2958 else 2890 else
2959#endif 2891#endif
2960 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))
2961 new_selection_text[ofs++] = C0_LF; 2895 new_selection_text[ofs++] = C0_LF;
2962 } 2896 }
2963
2964 if (end_col != selection.end.col)
2965 new_selection_text[ofs++] = C0_LF;
2966 2897
2967 new_selection_text[ofs] = 0; 2898 new_selection_text[ofs] = 0;
2968 2899
2969 if (ofs == 0) 2900 if (ofs == 0)
2970 { 2901 {
… …
2976 2907
2977 // 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
2978 selection.len = ofs; 2909 selection.len = ofs;
2979 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));
2980 2911
2981 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)))
2982 return; 2913 return;
2983 2914
2984 selection_grab (tm); 2915 selection_grab (tm);
2985} 2916}
2986 2917
2987bool 2918bool
2988rxvt_term::selection_grab (Time tm) 2919rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
2989{ 2920{
2921 Atom sel;
2922
2923 if (!clipboard)
2924 {
2990 selection_time = tm; 2925 selection_time = tm;
2991 2926 sel = XA_PRIMARY;
2992 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2993 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
2994 { 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 {
2995 display->set_selection_owner (this); 2937 display->set_selection_owner (this, clipboard);
2996 return true; 2938 return true;
2997 } 2939 }
2998 else 2940 else
2941 {
2942 selection_clear (clipboard);
2999 return false; 2943 return false;
2944 }
3000 2945
3001#if 0 2946#if 0
3002 XTextProperty ct; 2947 XTextProperty ct;
3003 2948
3004 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 2949 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3005 { 2950 {
3006 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 2951 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3007 XFree (ct.value); 2952 XFree (ct.value);
3008 } 2953 }
3009#endif 2954#endif
… …
3012/* ------------------------------------------------------------------------- */ 2957/* ------------------------------------------------------------------------- */
3013/* 2958/*
3014 * 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
3015 * EXT: button 1 press 2960 * EXT: button 1 press
3016 */ 2961 */
3017void 2962void ecb_cold
3018rxvt_term::selection_click (int clicks, int x, int y) 2963rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3019{ 2964{
3020 clicks = ((clicks - 1) % 3) + 1; 2965 clicks = ((clicks - 1) % 3) + 1;
3021 selection.clicks = clicks; /* save clicks so extend will work */ 2966 selection.clicks = clicks; /* save clicks so extend will work */
3022 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
3023 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 2977 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3024 2978
3025 if (clicks == 2 || clicks == 3) 2979 if (clicks == 2 || clicks == 3)
3026 selection_extend_colrow (selection.mark.col, 2980 selection_extend_colrow (selection.mark.col,
3027 selection.mark.row + view_start, 2981 selection.mark.row - view_start,
3028 0, /* button 3 */ 2982 0, /* button 3 */
3029 1, /* button press */ 2983 1, /* button press */
3030 0); /* click change */ 2984 0); /* click change */
3031} 2985}
3032 2986
3033/* ------------------------------------------------------------------------- */ 2987/* ------------------------------------------------------------------------- */
3034/* 2988/*
3035 * Mark a selection at the specified col/row 2989 * Mark a selection at the specified col/row
3036 */ 2990 */
3037void 2991void ecb_cold
3038rxvt_term::selection_start_colrow (int col, int row) 2992rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3039{ 2993{
3040 want_refresh = 1; 2994 want_refresh = 1;
3041 2995
3042 selection.mark.row = row - view_start; 2996 selection.mark.row = row + view_start;
3043 selection.mark.col = col; 2997 selection.mark.col = col;
3044 2998
3045 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 2999 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3046 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3000 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3047 3001
3048 while (selection.mark.col > 0 3002 while (selection.mark.col > 0
3049 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3003 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3050 --selection.mark.col; 3004 --selection.mark.col;
3051 3005
3052 if (selection.op) 3006 if (selection.op)
3007 {
3053 { /* clear the old selection */ 3008 /* clear the old selection */
3054 selection.beg.row = selection.end.row = selection.mark.row; 3009 selection.beg.row = selection.end.row = selection.mark.row;
3055 selection.beg.col = selection.end.col = selection.mark.col; 3010 selection.beg.col = selection.end.col = selection.mark.col;
3056 } 3011 }
3057 3012
3058 selection.op = SELECTION_INIT; 3013 selection.op = SELECTION_INIT;
… …
3064 * Word select: select text for 2 clicks 3019 * Word select: select text for 2 clicks
3065 * We now only find out the boundary in one direction 3020 * We now only find out the boundary in one direction
3066 */ 3021 */
3067 3022
3068/* 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 */
3069#define DELIMIT_TEXT(x) \ 3024#define DELIMIT_TEXT(x) \
3070 (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)))
3071#define DELIMIT_REND(x) 1 3026#define DELIMIT_REND(x) 1
3072 3027
3073void 3028void ecb_cold
3074rxvt_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
3075{ 3030{
3076 int col, row, dirnadd, tcol, trow, w1, w2; 3031 int col, row, dirnadd, tcol, trow, w1, w2;
3077 row_col_t bound; 3032 row_col_t bound;
3078 text_t *stp; 3033 text_t *stp;
3079 rend_t *srp; 3034 rend_t *srp;
3080 3035
3081 if (dirn == UP) 3036 if (dirn == UP)
3082 { 3037 {
3083 bound.row = - nsaved - 1; 3038 bound.row = top_row - 1;
3084 bound.col = 0; 3039 bound.col = 0;
3085 dirnadd = -1; 3040 dirnadd = -1;
3086 } 3041 }
3087 else 3042 else
3088 { 3043 {
… …
3136 } 3091 }
3137 } 3092 }
3138 break; 3093 break;
3139 } 3094 }
3140 3095
3141Old_Word_Selection_You_Die:
3142 if (dirn == DN) 3096 if (dirn == DN)
3143 col++; /* put us on one past the end */ 3097 col++; /* put us on one past the end */
3144 3098
3145 /* Poke the values back in */ 3099 /* Poke the values back in */
3146 ret->row = row; 3100 ret->row = row;
… …
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 }
… …
3329 selection_delimit_word (DN, &selection.end, &selection.end); 3283 selection_delimit_word (DN, &selection.end, &selection.end);
3330 } 3284 }
3331 else if (selection.clicks == 3) 3285 else if (selection.clicks == 3)
3332 { 3286 {
3333#if ENABLE_FRILLS 3287#if ENABLE_FRILLS
3334 if (OPTION (Opt_tripleclickwords)) 3288 if (option (Opt_tripleclickwords))
3335 { 3289 {
3336 selection_delimit_word (UP, &selection.beg, &selection.beg); 3290 selection_delimit_word (UP, &selection.beg, &selection.beg);
3337 3291
3338 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++)
3339 { 3293 {
3340 if (!ROW(end_row).is_longer ()) 3294 if (!ROW(end_row).is_longer ())
3341 { 3295 {
3342 selection.end.row = end_row; 3296 selection.end.row = end_row;
3343 selection.end.col = ROW(end_row).l; 3297 selection.end.col = ROW(end_row).l;
3298# if !ENABLE_MINIMAL
3344 selection_remove_trailing_spaces (); 3299 selection_remove_trailing_spaces ();
3300# endif
3345 break; 3301 break;
3346 } 3302 }
3347 } 3303 }
3348 } 3304 }
3349 else 3305 else
… …
3365 selection.end.row++; 3321 selection.end.row++;
3366 } 3322 }
3367 } 3323 }
3368 3324
3369 if (button3 && buttonpress) 3325 if (button3 && buttonpress)
3326 {
3370 { /* mark may need to be changed */ 3327 /* mark may need to be changed */
3371 if (closeto == LEFT) 3328 if (closeto == LEFT)
3372 { 3329 {
3373 selection.mark.row = selection.end.row; 3330 selection.mark.row = selection.end.row;
3374 selection.mark.col = selection.end.col - (selection.clicks == 2); 3331 selection.mark.col = selection.end.col - (selection.clicks == 2);
3375 } 3332 }
… …
3378 selection.mark.row = selection.beg.row; 3335 selection.mark.row = selection.beg.row;
3379 selection.mark.col = selection.beg.col; 3336 selection.mark.col = selection.beg.col;
3380 } 3337 }
3381 } 3338 }
3382 3339
3383#if ENABLE_FRILLS 3340#if !ENABLE_MINIMAL
3384 if (selection.rect && selection.beg.col > selection.end.col) 3341 if (selection.rect && selection.beg.col > selection.end.col)
3385 ::swap (selection.beg.col, selection.end.col); 3342 ::swap (selection.beg.col, selection.end.col);
3386#endif 3343#endif
3387}
3388 3344
3389#if ENABLE_FRILLS 3345 selection_changed ();
3390void 3346}
3347
3348#if !ENABLE_MINIMAL
3349void ecb_cold
3391rxvt_term::selection_remove_trailing_spaces () 3350rxvt_term::selection_remove_trailing_spaces () NOTHROW
3392{ 3351{
3393 int32_t end_col, end_row; 3352 int32_t end_col, end_row;
3394 text_t *stp; 3353 text_t *stp;
3395 3354
3396 end_col = selection.end.col; 3355 end_col = selection.end.col;
… …
3433/* ------------------------------------------------------------------------- */ 3392/* ------------------------------------------------------------------------- */
3434/* 3393/*
3435 * Double click on button 3 when already selected 3394 * Double click on button 3 when already selected
3436 * EXT: button 3 double click 3395 * EXT: button 3 double click
3437 */ 3396 */
3438void 3397void ecb_cold
3439rxvt_term::selection_rotate (int x, int y) 3398rxvt_term::selection_rotate (int x, int y) NOTHROW
3440{ 3399{
3441 selection.clicks = selection.clicks % 3 + 1; 3400 selection.clicks = selection.clicks % 3 + 1;
3442 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3401 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3443} 3402}
3444 3403
3445/* ------------------------------------------------------------------------- */ 3404/* ------------------------------------------------------------------------- */
3446/* 3405/*
3447 * Respond to a request for our current selection 3406 * Respond to a request for our current selection
3448 * EXT: SelectionRequest 3407 * EXT: SelectionRequest
3449 */ 3408 */
3450void 3409void ecb_cold
3451rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3410rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3452{ 3411{
3412 Atom property = rq.property == None ? rq.target : rq.property;
3453 XSelectionEvent ev; 3413 XSelectionEvent ev;
3454 dDisp;
3455 3414
3456 ev.type = SelectionNotify; 3415 ev.type = SelectionNotify;
3457 ev.property = None; 3416 ev.property = None;
3458 ev.display = rq.display; 3417 ev.display = rq.display;
3459 ev.requestor = rq.requestor; 3418 ev.requestor = rq.requestor;
… …
3473 *target++ = xa[XA_COMPOUND_TEXT]; 3432 *target++ = xa[XA_COMPOUND_TEXT];
3474#if X_HAVE_UTF8_STRING 3433#if X_HAVE_UTF8_STRING
3475 *target++ = xa[XA_UTF8_STRING]; 3434 *target++ = xa[XA_UTF8_STRING];
3476#endif 3435#endif
3477 3436
3478 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3437 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3479 32, PropModeReplace, 3438 32, PropModeReplace,
3480 (unsigned char *)target_list, target - target_list); 3439 (unsigned char *)target_list, target - target_list);
3481 ev.property = rq.property; 3440 ev.property = property;
3482 } 3441 }
3483#if TODO // TODO 3442#if TODO // TODO
3484 else if (rq.target == xa[XA_MULTIPLE]) 3443 else if (rq.target == xa[XA_MULTIPLE])
3485 { 3444 {
3486 /* TODO: Handle MULTIPLE */ 3445 /* TODO: Handle MULTIPLE */
3487 } 3446 }
3488#endif 3447#endif
3489 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3448 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3490 { 3449 {
3491 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3450 XChangeProperty (dpy, rq.requestor, property, rq.target,
3492 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3451 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3493 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;
3494 } 3459 }
3495 else if (rq.target == XA_STRING 3460 else if (rq.target == XA_STRING
3496 || rq.target == xa[XA_TEXT] 3461 || rq.target == xa[XA_TEXT]
3497 || rq.target == xa[XA_COMPOUND_TEXT] 3462 || rq.target == xa[XA_COMPOUND_TEXT]
3498 || rq.target == xa[XA_UTF8_STRING] 3463 || rq.target == xa[XA_UTF8_STRING]
… …
3520 style = enc_string; 3485 style = enc_string;
3521 else if (target == xa[XA_TEXT]) 3486 else if (target == xa[XA_TEXT])
3522 style = enc_text; 3487 style = enc_text;
3523 else if (target == xa[XA_COMPOUND_TEXT]) 3488 else if (target == xa[XA_COMPOUND_TEXT])
3524 style = enc_compound_text; 3489 style = enc_compound_text;
3525#if ENABLE_FRILLS 3490#if !ENABLE_MINIMAL
3526 else if (target == xa[XA_UTF8_STRING]) 3491 else if (target == xa[XA_UTF8_STRING])
3527 style = enc_utf8; 3492 style = enc_utf8;
3528#endif 3493#endif
3529 else 3494 else
3530 { 3495 {
3531 target = xa[XA_COMPOUND_TEXT]; 3496 target = xa[XA_COMPOUND_TEXT];
3532 style = enc_compound_text; 3497 style = enc_compound_text;
3533 } 3498 }
3534 3499
3535 if (selection.text) 3500 if (rq.selection == XA_PRIMARY && selection.text)
3536 { 3501 {
3537 cl = selection.text; 3502 cl = selection.text;
3538 selectlen = selection.len; 3503 selectlen = selection.len;
3539 } 3504 }
3505 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3506 {
3507 cl = selection.clip_text;
3508 selectlen = selection.clip_len;
3509 }
3540 else 3510 else
3541 { 3511 {
3542 cl = L""; 3512 cl = L"";
3543 selectlen = 0; 3513 selectlen = 0;
3544 } 3514 }
3545 3515
3546#if ENABLE_FRILLS 3516#if !ENABLE_MINIMAL
3547 // 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
3548 // so recode it manually 3518 // so recode it manually
3549 if (style == enc_utf8) 3519 if (style == enc_utf8)
3550 { 3520 {
3551 freect = 1; 3521 freect = 1;
… …
3554 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3524 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3555 ct.nitems = strlen ((char *)ct.value); 3525 ct.nitems = strlen ((char *)ct.value);
3556 } 3526 }
3557 else 3527 else
3558#endif 3528#endif
3559 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3529 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3560 freect = 1; 3530 freect = 1;
3561 else 3531 else
3562 { 3532 {
3563 /* if we failed to convert then send it raw */ 3533 /* if we failed to convert then send it raw */
3564 ct.value = (unsigned char *)cl; 3534 ct.value = (unsigned char *)cl;
3565 ct.nitems = selectlen; 3535 ct.nitems = selectlen;
3566 ct.encoding = target; 3536 ct.encoding = target;
3567 } 3537 }
3568 3538
3569 XChangeProperty (disp, rq.requestor, rq.property, 3539 XChangeProperty (dpy, rq.requestor, property,
3570 ct.encoding, 8, PropModeReplace, 3540 ct.encoding, 8, PropModeReplace,
3571 ct.value, (int)ct.nitems); 3541 ct.value, (int)ct.nitems);
3572 ev.property = rq.property; 3542 ev.property = property;
3573 3543
3574 if (freect) 3544 if (freect)
3575 XFree (ct.value); 3545 XFree (ct.value);
3576 } 3546 }
3577 3547
3578 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3548 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3579} 3549}
3580 3550
3581/* ------------------------------------------------------------------------- * 3551/* ------------------------------------------------------------------------- */
3582 * MOUSE ROUTINES *
3583 * ------------------------------------------------------------------------- */
3584
3585/*
3586 * return col/row values corresponding to x/y pixel values
3587 */
3588void
3589rxvt_term::pixel_position (int *x, int *y)
3590{
3591 *x = Pixel2Col (*x);
3592 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3593 *y = Pixel2Row (*y);
3594 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3595}
3596
3597/* ------------------------------------------------------------------------- */
3598#ifdef USE_XIM 3552#if USE_XIM
3599void 3553void ecb_cold
3600rxvt_term::im_set_position (XPoint &pos) 3554rxvt_term::im_set_position (XPoint &pos) NOTHROW
3601{ 3555{
3602 XWindowAttributes xwa; 3556 XWindowAttributes xwa;
3603 3557
3604 XGetWindowAttributes (display->display, vt, &xwa); 3558 XGetWindowAttributes (dpy, vt, &xwa);
3605 3559
3606 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3560 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3607 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3561 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3608} 3562}
3609#endif 3563#endif
3610 3564
3611#if ENABLE_OVERLAY 3565#if ENABLE_OVERLAY
3612void 3566void
3613rxvt_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
3614{ 3568{
3615 if (nrow < 1 || ncol < 1) 3569 if (nrow < 1 || ncol < 1)
3616 return; 3570 return;
3617 3571
3618 want_refresh = 1; 3572 want_refresh = 1;
… …
3627 h += 2; min_it (h, nrow); 3581 h += 2; min_it (h, nrow);
3628 3582
3629 x -= 1; clamp_it (x, 0, ncol - w); 3583 x -= 1; clamp_it (x, 0, ncol - w);
3630 y -= 1; clamp_it (y, 0, nrow - h); 3584 y -= 1; clamp_it (y, 0, nrow - h);
3631 3585
3632 ov_x = x; ov_y = y; 3586 ov.x = x; ov.y = y;
3633 ov_w = w; ov_h = h; 3587 ov.w = w; ov.h = h;
3634 3588
3635 ov_text = new text_t *[h]; 3589 ov.text = new text_t *[h];
3636 ov_rend = new rend_t *[h]; 3590 ov.rend = new rend_t *[h];
3637 3591
3638 for (y = 0; y < h; y++) 3592 for (y = 0; y < h; y++)
3639 { 3593 {
3640 text_t *tp = ov_text[y] = new text_t[w]; 3594 text_t *tp = ov.text[y] = new text_t[w];
3641 rend_t *rp = ov_rend[y] = new rend_t[w]; 3595 rend_t *rp = ov.rend[y] = new rend_t[w];
3642 3596
3643 text_t t0, t1, t2; 3597 text_t t0, t1, t2;
3644 rend_t r = OVERLAY_RSTYLE; 3598 rend_t r = OVERLAY_RSTYLE;
3645 3599
3646 if (y == 0) 3600 if (y == 0)
… …
3663 *rp = r; 3617 *rp = r;
3664 } 3618 }
3665} 3619}
3666 3620
3667void 3621void
3668rxvt_term::scr_overlay_off () 3622rxvt_term::scr_overlay_off () NOTHROW
3669{ 3623{
3670 if (!ov_text) 3624 if (!ov.text)
3671 return; 3625 return;
3672 3626
3673 want_refresh = 1; 3627 want_refresh = 1;
3674 3628
3675 for (int y = 0; y < ov_h; y++) 3629 for (int y = 0; y < ov.h; y++)
3676 { 3630 {
3677 delete [] ov_text[y]; 3631 delete [] ov.text[y];
3678 delete [] ov_rend[y]; 3632 delete [] ov.rend[y];
3679 } 3633 }
3680 3634
3681 delete [] ov_text; ov_text = 0; 3635 delete [] ov.text; ov.text = 0;
3682 delete [] ov_rend; ov_rend = 0; 3636 delete [] ov.rend; ov.rend = 0;
3683} 3637}
3684 3638
3685void 3639void
3686rxvt_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
3687{ 3641{
3688 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3642 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3689 return; 3643 return;
3690 3644
3691 x++, y++; 3645 x++, y++;
3692 3646
3693 ov_text[y][x] = text; 3647 ov.text[y][x] = text;
3694 ov_rend[y][x] = rend; 3648 ov.rend[y][x] = rend;
3695} 3649}
3696 3650
3697void 3651void
3698rxvt_term::scr_overlay_set (int x, int y, const char *s) 3652rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3699{ 3653{
3700 while (*s) 3654 while (*s)
3701 scr_overlay_set (x++, y, *s++); 3655 scr_overlay_set (x++, y, *s++);
3702} 3656}
3703 3657
3704void 3658void
3705rxvt_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
3706{ 3660{
3707 while (*s) 3661 while (*s)
3708 { 3662 {
3709 text_t t = *s++; 3663 text_t t = *s++;
3710 int width = wcwidth (t); 3664 int width = WCWIDTH (t);
3711 3665
3712 while (width--) 3666 while (width--)
3713 { 3667 {
3714 scr_overlay_set (x++, y, t); 3668 scr_overlay_set (x++, y, t);
3715 t = NOCHAR; 3669 t = NOCHAR;
3716 } 3670 }
3717 } 3671 }
3718} 3672}
3719 3673
3720void 3674void
3721rxvt_term::scr_swap_overlay () 3675rxvt_term::scr_swap_overlay () NOTHROW
3722{ 3676{
3723 if (!ov_text) 3677 if (!ov.text)
3724 return; 3678 return;
3725 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
3726 // swap screen mem with overlay 3685 // swap screen mem with overlay
3727 for (int y = ov_h; y--; ) 3686 for (int y = ov.h; y--; )
3728 { 3687 {
3729 text_t *t1 = ov_text[y]; 3688 text_t *t1 = ov.text[y];
3730 rend_t *r1 = ov_rend[y]; 3689 rend_t *r1 = ov.rend[y];
3731 3690
3732 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;
3733 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;
3734 3693
3735 for (int x = ov_w; x--; ) 3694 for (int x = ov.w; x--; )
3736 { 3695 {
3737 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3696 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3738 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));
3739 } 3698 }
3740 } 3699 }

Diff Legend

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