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.203 by root, Sat Dec 31 19:30:25 2005 UTC vs.
Revision 1.444 by sf-exg, Tue Apr 2 21:03:35 2013 UTC

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

Diff Legend

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