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

Diff Legend

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