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

Diff Legend

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