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.197 by root, Tue Dec 27 00:52:38 2005 UTC vs.
Revision 1.419 by root, Fri Jun 1 08:12:09 2012 UTC

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

Diff Legend

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