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

Diff Legend

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