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

Diff Legend

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