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.200 by root, Tue Dec 27 01:54:08 2005 UTC vs.
Revision 1.426 by sf-exg, Tue Oct 2 10:29:12 2012 UTC

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

Diff Legend

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