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.174 by root, Mon Dec 19 02:40:14 2005 UTC vs.
Revision 1.341 by root, Sat Apr 17 23:05:48 2010 UTC

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

Diff Legend

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