ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.215 by root, Sun Jan 8 06:35:23 2006 UTC vs.
Revision 1.428 by sf-exg, Sun Jan 13 17:42:24 2013 UTC

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

Diff Legend

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