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

Diff Legend

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