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.202 by root, Sat Dec 31 17:16:17 2005 UTC vs.
Revision 1.430 by root, Sun Jan 13 20:16:40 2013 UTC

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

Diff Legend

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