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

Diff Legend

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