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

Diff Legend

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