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

Diff Legend

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