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

Diff Legend

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