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.416 by root, Mon May 28 14:26:11 2012 UTC

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

Diff Legend

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