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.354 by root, Fri Oct 15 21:14:12 2010 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
24 * This file handles _all_ screen updates and selections 24 * This file handles _all_ screen updates and selections
25 */ 25 */
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29 29#include "rxvtperl.h" /* NECESSARY */
30#include <X11/Xmd.h> /* get the typedef for CARD32 */
31 30
32#include <inttypes.h> 31#include <inttypes.h>
33 32
34#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a separate compile!
35 34
35static inline void
36inline void fill_text (text_t *start, text_t value, int len) 36fill_text (text_t *start, text_t value, int len)
37{ 37{
38 while (len--) 38 while (len--)
39 *start++ = value; 39 *start++ = value;
40} 40}
41 41
… …
46 46
47/* ------------------------------------------------------------------------- * 47/* ------------------------------------------------------------------------- *
48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49 * ------------------------------------------------------------------------- */ 49 * ------------------------------------------------------------------------- */
50#define ZERO_SCROLLBACK() \ 50#define ZERO_SCROLLBACK() \
51 if (options & Opt_scrollTtyOutput) \ 51 if (option (Opt_scrollTtyOutput)) \
52 view_start = 0 52 view_start = 0
53#define CLEAR_SELECTION() \ 53#define CLEAR_SELECTION() \
54 selection.beg.row = selection.beg.col \ 54 selection.beg.row = selection.beg.col \
55 = selection.end.row = selection.end.col = 0 55 = selection.end.row = selection.end.col = 0
56#define CLEAR_ALL_SELECTION() \ 56#define CLEAR_ALL_SELECTION() \
… …
84 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 84 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
85#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 85#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
86 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 86 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
87 87
88/* 88/*
89 * CLEAR_ROWS : clear <num> rows starting from row <row>
90 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 89 * 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 */ 90 */
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) \ 91#define CLEAR_CHARS(x, y, num) \
102 if (mapped) \ 92 if (mapped) \
103 XClearArea (display->display, drawBuffer, x, y, \ 93 XClearArea (dpy, vt, x, y, \
104 (unsigned int)Width2Pixel (num), \ 94 (unsigned int)Width2Pixel (num), \
105 (unsigned int)Height2Pixel (1), False) 95 (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 96
113/* ------------------------------------------------------------------------- * 97/* ------------------------------------------------------------------------- *
114 * SCREEN `COMMON' ROUTINES * 98 * SCREEN `COMMON' ROUTINES *
115 * ------------------------------------------------------------------------- */ 99 * ------------------------------------------------------------------------- */
116 100
117/* Fill part/all of a line with blanks. */ 101/* Fill part/all of a line with blanks. */
118void 102void
119rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) 103rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
120{ 104{
121 efs &= ~RS_baseattrMask; 105 if (!l.t)
106 {
107 lalloc (l);
108 col = 0;
109 width = ncol;
110 }
111
112 l.touch ();
113
114 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles
122 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 115 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
123 116
124 text_t *et = l.t + col; 117 text_t *et = l.t + col;
125 rend_t *er = l.r + col; 118 rend_t *er = l.r + col;
126 119
… …
132} 125}
133 126
134/* ------------------------------------------------------------------------- */ 127/* ------------------------------------------------------------------------- */
135/* Fill a full line with blanks - make sure it is allocated first */ 128/* Fill a full line with blanks - make sure it is allocated first */
136void 129void
137rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) 130rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW
138{ 131{
139 if (!l.t)
140 lalloc (l);
141
142 scr_blank_line (l, 0, ncol, efs); 132 scr_blank_line (l, 0, ncol, efs);
133
134 l.l = 0;
135 l.f = 0;
136}
137
138// nuke a single wide character at the given column
139void
140rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
141{
142 // find begin
143 while (col > 0 && l.t[col] == NOCHAR)
144 col--;
145
146 rend_t rend = l.r[col] & ~RS_baseattrMask;
147 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
148
149 l.touch ();
150
151 // found start, nuke
152 do {
153 l.t[col] = ' ';
154 l.r[col] = rend;
155 col++;
156 } while (col < ncol && l.t[col] == NOCHAR);
143} 157}
144 158
145/* ------------------------------------------------------------------------- * 159/* ------------------------------------------------------------------------- *
146 * SCREEN INITIALISATION * 160 * SCREEN INITIALISATION *
147 * ------------------------------------------------------------------------- */ 161 * ------------------------------------------------------------------------- */
162
148void 163void
149rxvt_term::scr_reset () 164rxvt_term::scr_reset ()
150{ 165{
151 unsigned int p, q;
152 int k;
153
154#if ENABLE_OVERLAY
155 scr_overlay_off ();
156#endif
157
158 view_start = 0; 166 view_start = 0;
159 num_scr = 0; 167 num_scr = 0;
160 168
161 if (ncol == 0) 169 if (ncol == 0)
162 ncol = 80; 170 ncol = 80;
… …
166 174
167 if (ncol == prev_ncol && nrow == prev_nrow) 175 if (ncol == prev_ncol && nrow == prev_nrow)
168 return; 176 return;
169 177
170 // we need at least two lines for wrapping to work correctly 178 // we need at least two lines for wrapping to work correctly
171 if (nrow + saveLines < 2) 179 while (nrow + saveLines < 2)
172 { 180 {
181 //TODO//FIXME
173 saveLines++; 182 saveLines++;
174 prev_nrow--; 183 prev_nrow--;
175 nscrolled++; 184 top_row--;
176 } 185 }
177 186
178 want_refresh = 1; 187 want_refresh = 1;
179 188
180 int prev_total_rows = prev_nrow + saveLines; 189 int prev_total_rows = prev_nrow + saveLines;
181 int total_rows = nrow + saveLines; 190 total_rows = nrow + saveLines;
182 191
183 screen.tscroll = 0; 192 screen.tscroll = 0;
184 screen.bscroll = nrow - 1; 193 screen.bscroll = nrow - 1;
185 194
186 if (!save) 195 if (!row_buf)
187 { 196 {
188 /* 197 /*
189 * first time called so just malloc everything: don't rely on realloc 198 * first time called so just malloc everything: don't rely on realloc
190 * Note: this is still needed so that all the scrollback lines are NULL
191 */ 199 */
192 nscrolled = 0; /* no saved lines */ 200 top_row = 0;
193 term_start = 0; 201 term_start = 0;
194 nsaved = 0;
195 202
196 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 203 talloc = new rxvt_salloc (ncol * sizeof (text_t));
197 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
198 205
199 save = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
200 buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 206 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
201 drawn = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); 207 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
202 swap_save = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); 208 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
203 209
204 screen.line = (line_t **)rxvt_calloc (nrow, sizeof (line_t *));
205
206 scr_update_term ();
207
208 for (p = nrow; p--; ) 210 for (int row = nrow; row--; )
209 { 211 {
210 scr_blank_screen_mem (*screen.line[p], DEFAULT_RSTYLE); 212 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
211 scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); 213 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
212 scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE); 214 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
213 } 215 }
214 216
215 memset (charsets, 'B', sizeof (charsets)); 217 memset (charsets, 'B', sizeof (charsets));
216 rstyle = DEFAULT_RSTYLE; 218 rstyle = DEFAULT_RSTYLE;
217 screen.flags = Screen_DefaultFlags; 219 screen.flags = Screen_DefaultFlags;
… …
232 selection.text = NULL; 234 selection.text = NULL;
233 selection.len = 0; 235 selection.len = 0;
234 selection.op = SELECTION_CLEAR; 236 selection.op = SELECTION_CLEAR;
235 selection.screen = PRIMARY; 237 selection.screen = PRIMARY;
236 selection.clicks = 0; 238 selection.clicks = 0;
237 CLEAR_ALL_SELECTION (); 239 selection.clip_text = NULL;
238 rvideo = 0; 240 selection.clip_len = 0;
239 } 241 }
240 else 242 else
241 { 243 {
242 /* 244 /*
243 * add or delete rows as appropriate 245 * add or delete rows as appropriate
244 */ 246 */
245 247
246 rxvt_salloc *old_ta; 248 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
247 rxvt_salloc *old_ra; 249 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
248 250
251#if 0
249 if (nrow < prev_nrow) 252 if (nrow < prev_nrow)
250 { 253 {
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++) 254 for (int row = nrow; row < prev_nrow; row++)
257 { 255 {
258 lfree (save[p + saveLines]);
259 lfree (swap_save[p]); 256 lfree (swap_buf [row]);
260 lfree (drawn[p]); 257 lfree (drawn_buf[row]);
261 } 258 }
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 { 259 }
270 /* add rows */ 260#endif
271 scr_reset_realloc (); /* realloc _first_ */
272 261
273 int ocol = ncol; 262 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 263 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
275 264
276 k = min (nscrolled, nrow - prev_nrow); 265 for (int row = min (nrow, prev_nrow); row--; )
266 {
267 lresize (drawn_buf[row]);
268 lresize (swap_buf [row]);
269 }
277 270
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++) 271 for (int row = prev_nrow; row < nrow; row++)
272 {
273 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
274 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
275 }
276
277 line_t *old_buf = row_buf;
278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
279
280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
281 int pend = MOD (term_start + top_row , prev_total_rows);
282 int q = total_rows; // rewrapped row
283
284 if (top_row)
285 {
286 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
287 // to come up with a lean and mean algorithm.
288 // TODO: maybe optimise when width didn't change
289
290 row_col_t ocur = screen.cur;
291 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
292
293 do
287 { 294 {
288 swap_save[p].clear (); scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); 295 p = MOD (p - 1, prev_total_rows);
289 drawn[p].clear (); scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE); 296 assert (old_buf [MOD (p, prev_total_rows)].t);
290 }
291
292 if (k > 0)
293 {
294 scr_scroll_text (0, (int)nrow - 1, -k, 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; 297 int plines = 1;
298 int llen = old_buf [MOD (p, prev_total_rows)].l;
352 299
353 assert (llen >= 0); 300 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
354
355 while (p && save[p - 1].l < 0)
356 { 301 {
302 p = MOD (p - 1, prev_total_rows);
303
357 --p; 304 plines++;
358 llen += prev_ncol; 305 llen += prev_ncol;
359 } 306 }
360 307
361 int qlines = llen / ncol + 1; 308 int qlines = max (0, (llen - 1) / ncol) + 1;
309
310 // drop partial lines completely
311 if (q < qlines)
312 break;
313
314 q -= qlines;
315
362 int lofs = 0; 316 int lofs = 0;
317 line_t *qline;
363 318
364 q -= qlines; 319 // re-assemble the full line by destination lines
365
366 int qrow = q;
367
368 printf ("QL %d llen %d\n", qlines, llen);//D
369 for (; qlines--; qrow++) 320 for (int qrow = q; qlines--; qrow++)
370 { 321 {
322 qline = row_buf + qrow;
323 lalloc (*qline);
324 qline->l = ncol;
325 qline->is_longer (1);
326
327 int qcol = 0;
328
329 // see below for cursor adjustment rationale
371 if (qrow >= 0) 330 if (p == ocur.row)
331 screen.cur.row = q - (total_rows - nrow);
332
333 // fill a single destination line
334 while (lofs < llen && qcol < ncol)
372 { 335 {
373 tp [qrow] = (text_t *)ta->alloc ();
374 rp [qrow] = (rend_t *)ra->alloc ();
375 tl [qrow] = LINE_CONT1;
376
377 int qcol = 0;
378
379 for (;;)
380 {
381 int prow = lofs / prev_ncol + p; 336 int prow = lofs / prev_ncol;
382 int pcol = lofs % prev_ncol; 337 int pcol = lofs % prev_ncol;
383 338
339 prow = MOD (p + prow, prev_total_rows);
340
341 // we only adjust the cursor _row_ and put it into
342 // the topmost line of "long line" it was in, as
343 // this seems to upset applications/shells/readline
344 // least.
345 if (prow == ocur.row)
346 screen.cur.row = q - (total_rows - nrow);
347
348 line_t &pline = old_buf [prow];
349
384 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 350 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
385 351
386 printf ("q %d lofs %d>%d len %d pq %d:%d p %d:%d q :%d\n", q, llen, lofs, len, prev_ncol, ncol, prow, pcol, qcol);
387
388 if (len <= 0)
389 {
390 tl [qrow] = qcol;
391
392 TODO
393 scr_blank_line (tp [qrow] + qcol, rp [qrow] + qcol,
394 ncol - qcol, DEFAULT_RSTYLE);
395
396 break;
397 }
398
399 assert (lofs < 1000);
400
401 memcpy (tp [qrow] + qcol, save[prow].t + pcol, len * sizeof (text_t)); 352 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
402 memcpy (rp [qrow] + qcol, save[prow].r + pcol, len * sizeof (rend_t)); 353 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
403 354
404 lofs += len; 355 lofs += len;
405 qcol += len; 356 qcol += len;
406
407 if (qcol == ncol)
408 break;
409 }
410 } 357 }
411 else
412 lofs += ncol;
413 } 358 }
359
360 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
361 qline->is_longer (0);
362 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
414 } 363 }
364 while (p != pend && q > 0);
365
366 term_start = total_rows - nrow;
367 top_row = q - term_start;
368
369 // make sure all terminal lines exist
370 while (top_row > 0)
371 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
372 }
373 else
415 } 374 {
375 // if no scrollback exists (yet), wing, instead of wrap
416 376
417 free (screen.text); screen.text = tp; 377 for (int row = min (nrow, prev_nrow); row--; )
418 free (screen.rend); screen.rend = rp; 378 {
419 free (screen.tlen); screen.tlen = tl; 379 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
380 line_t &qline = row_buf [row];
420 381
421 for (p = 0; p < total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D 382 qline = pline;
422#endif 383 lresize (qline);
384 }
423 385
424 if (tabs) 386 for (int row = prev_nrow; row < nrow; row++)
387 {
388 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
389 }
390
391 term_start = 0;
392 }
393
394 free (old_buf);
395 delete old_ta;
396 delete old_ra;
397
398 clamp_it (screen.cur.row, 0, nrow - 1);
399 clamp_it (screen.cur.col, 0, ncol - 1);
400 }
401
425 free (tabs); 402 free (tabs);
426 } 403 tabs = (char *)rxvt_malloc (ncol);
404
405 for (int col = ncol; --col; )
406 tabs [col] = col % TABSIZE == 0;
407
408 CLEAR_ALL_SELECTION ();
427 409
428 prev_nrow = nrow; 410 prev_nrow = nrow;
429 prev_ncol = ncol; 411 prev_ncol = ncol;
430 412
431 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
432
433 for (p = 0; p < ncol; p++)
434 tabs[p] = (p % TABSIZE == 0) ? 1 : 0;
435
436 tt_winch (); 413 tt_winch ();
437}
438 414
439void 415 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
440rxvt_term::scr_reset_realloc ()
441{
442 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} 416}
450 417
451/* ------------------------------------------------------------------------- */ 418/* ------------------------------------------------------------------------- */
452/* 419/*
453 * Free everything. That way malloc debugging can find leakage. 420 * Free everything. That way malloc debugging can find leakage.
454 */ 421 */
455void 422void
456rxvt_term::scr_release () 423rxvt_term::scr_release () NOTHROW
457{ 424{
458 unsigned int total_rows; 425 if (row_buf)
459 426 {
460 total_rows = nrow + saveLines;
461
462 delete talloc; talloc = 0; 427 delete talloc; talloc = 0;
463 delete ralloc; ralloc = 0; 428 delete ralloc; ralloc = 0;
464 429
465 free (screen.line); 430 free (row_buf);
466 free (save); 431 free (swap_buf);
467 free (swap_save);
468 free (drawn); 432 free (drawn_buf);
469 free (buf); 433 row_buf = 0; // signal that we freed all the arrays above
434
470 free (tabs); 435 free (tabs);
436 tabs = 0;
437 }
471} 438}
472 439
473/* ------------------------------------------------------------------------- */ 440/* ------------------------------------------------------------------------- */
474/* 441/*
475 * Hard reset 442 * Hard/Soft reset
476 */ 443 */
477void 444void
478rxvt_term::scr_poweron () 445rxvt_term::scr_poweron ()
479{ 446{
480 scr_release (); 447 scr_release ();
481 prev_nrow = prev_ncol = 0; 448 prev_nrow = prev_ncol = 0;
449 rvideo_mode = false;
450 scr_soft_reset ();
482 scr_reset (); 451 scr_reset ();
483 452
484 scr_clear (true); 453 scr_clear (true);
485 scr_refresh (SLOW_REFRESH); 454 scr_refresh ();
455}
456
457void
458rxvt_term::scr_soft_reset ()
459{
460 /* only affects modes, nothing drastic such as clearing the screen */
461#if ENABLE_OVERLAY
462 scr_overlay_off ();
463#endif
464
465 if (current_screen != PRIMARY)
466 scr_swap_screen ();
467
468 scr_scroll_region (0, MAX_ROWS - 1);
469 scr_rendition (0, ~RS_None);
470 scr_insert_mode (0);
486} 471}
487 472
488/* ------------------------------------------------------------------------- * 473/* ------------------------------------------------------------------------- *
489 * PROCESS SCREEN COMMANDS * 474 * PROCESS SCREEN COMMANDS *
490 * ------------------------------------------------------------------------- */ 475 * ------------------------------------------------------------------------- */
… …
492 * Save and Restore cursor 477 * Save and Restore cursor
493 * XTERM_SEQ: Save cursor : ESC 7 478 * XTERM_SEQ: Save cursor : ESC 7
494 * XTERM_SEQ: Restore cursor: ESC 8 479 * XTERM_SEQ: Restore cursor: ESC 8
495 */ 480 */
496void 481void
497rxvt_term::scr_cursor (int mode) 482rxvt_term::scr_cursor (cursor_mode mode) NOTHROW
498{ 483{
499 screen_t *s; 484 screen_t *s;
500 485
501#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 486#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
502 if (current_screen == SECONDARY) 487 if (current_screen == SECONDARY)
… …
526 set_font_style (); 511 set_font_style ();
527 break; 512 break;
528 } 513 }
529 514
530 /* boundary check in case screen size changed between SAVE and RESTORE */ 515 /* boundary check in case screen size changed between SAVE and RESTORE */
531 MIN_IT (s->cur.row, nrow - 1); 516 min_it (s->cur.row, nrow - 1);
532 MIN_IT (s->cur.col, ncol - 1); 517 min_it (s->cur.col, ncol - 1);
533#ifdef DEBUG_STRICT
534 assert (s->cur.row >= 0); 518 assert (s->cur.row >= 0);
535 assert (s->cur.col >= 0); 519 assert (s->cur.col >= 0);
536#else /* drive with your eyes closed */ 520}
537 MAX_IT (s->cur.row, 0); 521
538 MAX_IT (s->cur.col, 0); 522void
539#endif 523rxvt_term::scr_swap_screen ()
524{
525 if (!option (Opt_secondaryScreen))
526 return;
527
528 for (int i = prev_nrow; i--; )
529 ::swap (ROW(i), swap_buf [i]);
530
531 ::swap (screen.cur, swap.cur);
532
533 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
534 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
540} 535}
541 536
542/* ------------------------------------------------------------------------- */ 537/* ------------------------------------------------------------------------- */
543/* 538/*
544 * Swap between primary and secondary screens 539 * Swap between primary and secondary screens
545 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 540 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
546 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 541 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
547 */ 542 */
548int 543void
549rxvt_term::scr_change_screen (int scrn) 544rxvt_term::scr_change_screen (int scrn)
550{ 545{
551 int i; 546 if (scrn == current_screen)
547 return;
548
549 want_refresh = 1;
550 view_start = 0;
551
552 selection_check (2); /* check for boundary cross */
553
554 current_screen = scrn;
555
552#if NSCREENS 556#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) 557 if (option (Opt_secondaryScreen))
576 { 558 {
577 num_scr = 0; 559 num_scr = 0;
578 offset = saveLines;
579 560
580 for (i = prev_nrow; i--;) 561 scr_swap_screen ();
581 SWAP_IT (*(screen.line[i]), swap_save[i], line_t);
582 562
583 SWAP_IT (screen.charset, swap.charset, int16_t); 563 ::swap (screen.charset, swap.charset);
584 SWAP_IT (screen.flags, swap.flags, int); 564 ::swap (screen.flags, swap.flags);
585 screen.flags |= Screen_VisibleCursor; 565 screen.flags |= Screen_VisibleCursor;
586 swap.flags |= Screen_VisibleCursor; 566 swap.flags |= Screen_VisibleCursor;
587 } 567 }
588 else 568 else
589#endif 569#endif
590 if (options & Opt_secondaryScroll) 570 if (option (Opt_secondaryScroll))
591 scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0); 571 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
592
593 return scrn;
594} 572}
595 573
596// clear WrapNext indicator, solidifying position on next line 574// clear WrapNext indicator, solidifying position on next line
597void 575void
598rxvt_term::scr_do_wrap () 576rxvt_term::scr_do_wrap () NOTHROW
599{ 577{
600 if (!(screen.flags & Screen_WrapNext)) 578 if (!(screen.flags & Screen_WrapNext))
601 return; 579 return;
602 580
603 screen.flags &= ~Screen_WrapNext; 581 screen.flags &= ~Screen_WrapNext;
604 582
605 screen.cur.col = 0; 583 screen.cur.col = 0;
606 584
607 if (screen.cur.row == screen.bscroll) 585 if (screen.cur.row == screen.bscroll)
608 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 586 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
609 else if (screen.cur.row < nrow - 1) 587 else if (screen.cur.row < nrow - 1)
610 screen.cur.row++; 588 screen.cur.row++;
611} 589}
612 590
613/* ------------------------------------------------------------------------- */ 591/* ------------------------------------------------------------------------- */
614/* 592/*
615 * Change the colour for following text 593 * Change the colour for following text
616 */ 594 */
617void 595void
618rxvt_term::scr_color (unsigned int color, int fgbg) 596rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
619{ 597{
620 if (color > maxTermCOLOR) 598 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
621 color = fgbg; 599 color = fgbg;
622 600
623 if (fgbg == Color_fg) 601 if (fgbg == Color_fg)
624 rstyle = SET_FGCOLOR (rstyle, color); 602 rstyle = SET_FGCOLOR (rstyle, color);
625 else 603 else
… …
629/* ------------------------------------------------------------------------- */ 607/* ------------------------------------------------------------------------- */
630/* 608/*
631 * Change the rendition style for following text 609 * Change the rendition style for following text
632 */ 610 */
633void 611void
634rxvt_term::scr_rendition (int set, int style) 612rxvt_term::scr_rendition (int set, int style) NOTHROW
635 { 613{
636 if (set) 614 if (set)
637 rstyle |= style; 615 rstyle |= style;
638 else if (style == ~RS_None) 616 else if (style == ~RS_None)
639 rstyle = DEFAULT_RSTYLE; 617 rstyle = DEFAULT_RSTYLE;
640 else 618 else
641 rstyle &= ~style; 619 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} 620}
651 621
652/* ------------------------------------------------------------------------- */ 622/* ------------------------------------------------------------------------- */
653/* 623/*
654 * Scroll text between <row1> and <row2> inclusive, by <count> lines 624 * Scroll text between <row1> and <row2> inclusive, by <count> lines
655 * count positive ==> scroll up 625 * count positive ==> scroll up
656 * count negative ==> scroll down 626 * count negative ==> scroll down
657 * spec == 0 for normal routines
658 */ 627 */
659int 628int
660rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec) 629rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
661{ 630{
662 int i, j;
663
664 if (count == 0 || (row1 > row2)) 631 if (count == 0 || (row1 > row2))
665 return 0; 632 return 0;
666 633
667 want_refresh = 1; 634 want_refresh = 1;
635 num_scr += count;
668 636
669 if (row1 == 0 && count > 0 637 if (count > 0
638 && row1 == 0
670 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 639 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
640 {
641 top_row = max (top_row - count, -saveLines);
642
643 // scroll everything up 'count' lines
644 term_start = (term_start + count) % total_rows;
645
646 // sever bottommost line
671 { 647 {
672 nscrolled += count; 648 line_t &l = ROW(row2 - count);
673 649 l.is_longer (0);
674 if (nscrolled > saveLines) 650 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 } 651 }
682 else if (!spec)
683 row1 += saveLines;
684 652
685 row2 += saveLines; 653 // erase newly scrolled-in lines
654 for (int i = count; i--; )
655 {
656 line_t &l = ROW(nrow - 1 - i);
686 657
658 // optimize if already cleared, can be significant on slow machines
659 // could be rolled into scr_blank_screen_mem
660 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
661 {
662 scr_blank_line (l, 0, l.l, rstyle);
663 l.l = 0;
664 l.f = 0;
665 }
666 else
667 scr_blank_screen_mem (l, rstyle);
668 }
669
670 // now copy lines below the scroll region bottom to the
671 // bottom of the screen again, so they look as if they
672 // hadn't moved.
673 for (int i = nrow; --i > row2; )
674 {
675 line_t &l1 = ROW(i - count);
676 line_t &l2 = ROW(i);
677
678 ::swap (l1, l2);
679 l2.touch ();
680 }
681
682 // move and/or clear selection, if any
687 if (selection.op && current_screen == selection.screen) 683 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 } 684 {
702 else if (j >= row1 && j <= row2)
703 {
704 /* move selected region too */
705 selection.beg.row -= count; 685 selection.beg.row -= count;
706 selection.end.row -= count; 686 selection.end.row -= count;
707 selection.mark.row -= count; 687 selection.mark.row -= count;
688
689 if (selection.beg.row < top_row
690 || selection.end.row < top_row
691 || selection.mark.row < top_row)
692 {
693 CLEAR_ALL_SELECTION ();
694 selection.op = SELECTION_CLEAR;
695 }
696 }
697
698 // finally move the view window, if desired
699 if (option (Opt_scrollWithBuffer)
700 && view_start != 0
701 && view_start != -saveLines)
702 scr_page (UP, count);
703
704 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
705 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
706 }
707 else
708 {
709 if (selection.op && current_screen == selection.screen)
708 } 710 {
709 } 711 if ((selection.beg.row < row1 && selection.end.row > row1)
712 || (selection.beg.row < row2 && selection.end.row > row2)
713 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
714 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
715 || (selection.end.row - count < row1 && selection.end.row >= row1)
716 || (selection.end.row - count > row2 && selection.end.row <= row2))
717 {
718 CLEAR_ALL_SELECTION ();
719 selection.op = SELECTION_CLEAR;
720 }
721 else if (selection.end.row >= row1 && selection.end.row <= row2)
722 {
723 /* move selected region too */
724 selection.beg.row -= count;
725 selection.end.row -= count;
726 selection.mark.row -= count;
710 727
711 selection_check (0); /* _after_ nscrolled update */ 728 selection_check (0);
729 }
730 }
712 731
713 num_scr += count; 732 // use a simple and robust scrolling algorithm, this
714 j = count; 733 // part of scr_scroll_text is not time-critical.
715 734
716 if (count < 0)
717 count = -count;
718
719 i = row2 - row1 + 1; 735 int rows = row2 - row1 + 1;
720 MIN_IT (count, i);
721 736
722 if (j > 0) 737 min_it (count, rows);
738
739 line_t *temp_buf = row_buf + total_rows;
740
741 for (int row = 0; row < rows; row++)
742 {
743 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
744
745 if (!IN_RANGE_EXC (row + count, 0, rows))
746 scr_blank_screen_mem (temp_buf [row], rstyle);
747 }
748
749 for (int row = 0; row < rows; row++)
750 ROW(row1 + row) = temp_buf [row];
723 { 751 }
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 752
760 return count; 753 return count;
761} 754}
762 755
763/* ------------------------------------------------------------------------- */ 756/* ------------------------------------------------------------------------- */
764/* 757/*
765 * Add text given in <str> of length <len> to screen struct 758 * Add text given in <str> of length <len> to screen struct
766 */ 759 */
767void 760void
768rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 761rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
769{ 762{
770 if (len <= 0) /* sanity */ 763 if (len <= 0) /* sanity */
771 return; 764 return;
772 765
773 unsigned char checksel; 766 unsigned char checksel;
774 unicode_t c; 767 unicode_t c;
775 int row, last_col; 768 int ncol = this->ncol;
776 const unicode_t *strend = str + len; 769 const wchar_t *strend = str + len;
777 770
778 want_refresh = 1; 771 want_refresh = 1;
779 ZERO_SCROLLBACK (); 772 ZERO_SCROLLBACK ();
780 last_col = ncol;
781 773
782 if (nlines > 0) 774 if (minlines > 0)
783 { 775 {
784 nlines += screen.cur.row - screen.bscroll; 776 minlines += screen.cur.row - screen.bscroll;
777 min_it (minlines, screen.cur.row - top_row);
778
785 if ((nlines > 0) 779 if (minlines > 0
786 && (screen.tscroll == 0) 780 && screen.tscroll == 0
787 && (screen.bscroll == (nrow - 1))) 781 && screen.bscroll == nrow - 1)
788 { 782 {
789 /* _at least_ this many lines need to be scrolled */ 783 /* _at least_ this many lines need to be scrolled */
790 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); 784 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
791 screen.cur.row -= nlines; 785 screen.cur.row -= minlines;
792 } 786 }
793 } 787 }
794 788
795#ifdef DEBUG_STRICT
796 assert (screen.cur.col < last_col); 789 assert (screen.cur.col < ncol);
797 assert ((screen.cur.row < nrow) 790 assert (screen.cur.row < nrow
798 && (screen.cur.row >= - (int32_t)nscrolled)); 791 && screen.cur.row >= top_row);
799#else /* drive with your eyes closed */ 792 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 793
806 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 794 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
807 795
808 line_t *line = save + row; 796 line_t *line = &ROW(row);
809 797
810 while (str < strend) 798 while (str < strend)
811 { 799 {
812 c = *str++; 800 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
813 801
814 if (c < 0x20) 802 if (expect_false (c < 0x20))
815 if (c == C0_LF) 803 if (c == C0_LF)
816 { 804 {
817 if (!line->is_longer ()) /* XXX: think about this */
818 MAX_IT (line->l, screen.cur.col); 805 max_it (line->l, screen.cur.col);
819 806
820 screen.flags &= ~Screen_WrapNext; 807 screen.flags &= ~Screen_WrapNext;
821 808
822 if (screen.cur.row == screen.bscroll) 809 if (screen.cur.row == screen.bscroll)
823 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 810 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
824 else if (screen.cur.row < (nrow - 1)) 811 else if (screen.cur.row < (nrow - 1))
825 row = (++screen.cur.row) + saveLines; 812 row = ++screen.cur.row;
826 813
827 line = save + row; /* _must_ refresh */ 814 line = &ROW(row); /* _must_ refresh */
828 continue; 815 continue;
829 } 816 }
830 else if (c == C0_CR) 817 else if (c == C0_CR)
831 { 818 {
832 if (!line->is_longer ()) /* XXX: think about this */
833 MAX_IT (line->l, screen.cur.col); 819 max_it (line->l, screen.cur.col);
834 820
835 screen.flags &= ~Screen_WrapNext; 821 screen.flags &= ~Screen_WrapNext;
836 screen.cur.col = 0; 822 screen.cur.col = 0;
837 continue; 823 continue;
838 } 824 }
… …
840 { 826 {
841 scr_tab (1, true); 827 scr_tab (1, true);
842 continue; 828 continue;
843 } 829 }
844 830
831 if (expect_false (
845 if (checksel /* see if we're writing within selection */ 832 checksel /* see if we're writing within selection */
846 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 833 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
847 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 834 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
835 ))
848 { 836 {
849 checksel = 0; 837 checksel = 0;
850 /* 838 /*
851 * If we wrote anywhere in the selected area, kill the selection 839 * If we wrote anywhere in the selected area, kill the selection
852 * XXX: should we kill the mark too? Possibly, but maybe that 840 * XXX: should we kill the mark too? Possibly, but maybe that
853 * should be a similar check. 841 * should be a similar check.
854 */ 842 */
855 CLEAR_SELECTION (); 843 CLEAR_SELECTION ();
856 } 844 }
857 845
858 if (screen.flags & Screen_WrapNext) 846 if (expect_false (screen.flags & Screen_WrapNext))
859 { 847 {
860 line->set_is_longer ();
861
862 scr_do_wrap (); 848 scr_do_wrap ();
863 849
850 line->l = ncol;
851 line->is_longer (1);
852
864 row = screen.cur.row + saveLines; 853 row = screen.cur.row;
865 line = save + row; /* _must_ refresh */ 854 line = &ROW(row); /* _must_ refresh */
866 } 855 }
867 856
868 // some utf-8 decoders "decode" surrogate characters: let's fix this. 857 // some utf-8 decoders "decode" surrogate characters: let's fix this.
869 if (IN_RANGE (c, 0xd800, 0xdfff)) 858 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
870 c = 0xfffd; 859 c = 0xfffd;
871 860
872 // rely on wcwidth to tell us the character width, at least for non-latin1 861 // rely on wcwidth to tell us the character width, do wcwidth before
873 // do wcwidth before further replacements, as wcwidth might return -1 862 // 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 863 // drawing characters below as they might be invalid in the current
875 // locale. 864 // locale.
876 int width = c < 0x100 ? 1 : wcwidth (c); 865 int width = WCWIDTH (c);
877 866
878 if (charsets[screen.charset] == '0') // DEC SPECIAL 867 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
879 { 868 {
880 // vt100 special graphics and line drawing 869 // vt100 special graphics and line drawing
881 // 5f-7e standard vt100 870 // 5f-7e standard vt100
882 // 40-5e rxvt extension for extra curses acs chars 871 // 40-5e rxvt extension for extra curses acs chars
883 static uint16_t vt100_0[62] = { // 41 .. 7e 872 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
896 c = vt100_0[c - 0x41]; 885 c = vt100_0[c - 0x41];
897 width = 1; // vt100 line drawing characters are always single-width 886 width = 1; // vt100 line drawing characters are always single-width
898 } 887 }
899 } 888 }
900 889
901 if (screen.flags & Screen_Insert) 890 if (expect_false (screen.flags & Screen_Insert))
902 scr_insdel_chars (width, INSERT); 891 scr_insdel_chars (width, INSERT);
903 892
904 if (width != 0) 893 if (width != 0)
905 { 894 {
906#if !UNICODE_3 895#if !UNICODE_3
… …
911# else 900# else
912 c = 0xfffd; 901 c = 0xfffd;
913# endif 902# endif
914#endif 903#endif
915 904
905 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
906
907 // if the character doesn't fit into the remaining columns...
908 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
909 {
910 if (screen.flags & Screen_Autowrap)
911 {
912 // ... artificially enlargen the previous one
913 c = NOCHAR;
914 // and try the same character next loop iteration
915 --str;
916 }
917 else
918 screen.cur.col = ncol - width;
919 }
920
916 // nuke the character at this position, if required 921 // nuke the character at this position, if required
922 // due to wonderful coincidents everywhere else in this loop
923 // we never have to check for overwriting a wide char itself,
924 // only its tail.
917 if (line->t[screen.cur.col] == NOCHAR 925 if (expect_false (line->t[screen.cur.col] == NOCHAR))
918 || (screen.cur.col < ncol - 1 926 scr_kill_char (*line, screen.cur.col);
919 && line->t[screen.cur.col + 1] == NOCHAR))
920 {
921 int col = screen.cur.col;
922 927
923 // find begin 928 line->touch ();
924 while (col > 0 && line->t[col] == NOCHAR)
925 col--;
926
927 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
928
929 // found begin, nuke
930 do {
931 line->t[col] = ' ';
932 line->r[col] = rend;
933 col++;
934 } while (col < ncol && line->t[col] == NOCHAR);
935 }
936
937 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
938
939 // if the character doesn't fit into the remaining columns...
940 if (screen.cur.col > last_col - width && last_col >= width)
941 {
942 // ...output spaces
943 c = ' ';
944 // and try the same character next loop iteration
945 --str;
946 }
947 929
948 do 930 do
949 { 931 {
950 line->t[screen.cur.col] = c; 932 line->t[screen.cur.col] = c;
951 line->r[screen.cur.col] = rend; 933 line->r[screen.cur.col] = rend;
952 934
953 if (screen.cur.col < last_col - 1) 935 if (expect_true (screen.cur.col < ncol - 1))
954 screen.cur.col++; 936 screen.cur.col++;
955 else 937 else
956 { 938 {
957 line->l = last_col; 939 line->l = ncol;
958 if (screen.flags & Screen_Autowrap) 940 if (screen.flags & Screen_Autowrap)
959 screen.flags |= Screen_WrapNext; 941 screen.flags |= Screen_WrapNext;
960 break; 942
943 goto end_of_line;
961 } 944 }
962 945
963 c = NOCHAR; 946 c = NOCHAR;
964 } 947 }
965 while (--width > 0); 948 while (expect_false (--width > 0));
966 949
967 // pad with spaces when overwriting wide character with smaller one 950 // pad with spaces when overwriting wide character with smaller one
968 if (!width)
969 for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) 951 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
970 { 952 {
971 line->t[c] = ' '; 953 line->t[c] = ' ';
972 line->r[c] = rend; 954 line->r[c] = rend;
973 } 955 }
956
957end_of_line:
974 } 958 ;
959 }
960#if ENABLE_COMBINING
975 else // width == 0 961 else // width == 0
976 { 962 {
977#if ENABLE_COMBINING 963 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 { 964 {
965 // handle combining characters
966 // we just tag the accent on the previous on-screen character.
967 // this is arguably not correct, but also arguably not wrong.
968 // we don't handle double-width characters nicely yet.
969 line_t *linep;
970 text_t *tp;
971 rend_t *rp;
972
973 if (screen.cur.col > 0)
974 {
975 linep = line;
987 tp = line->t + screen.cur.col - 1; 976 tp = line->t + screen.cur.col - 1;
988 rp = line->r + screen.cur.col - 1; 977 rp = line->r + screen.cur.col - 1;
978 }
979 else if (screen.cur.row > 0
980 && ROW(screen.cur.row - 1).is_longer ())
981 {
982 linep = &ROW(screen.cur.row - 1);
983 tp = line->t + ncol - 1;
984 rp = line->r + ncol - 1;
985 }
986 else
987 continue;
989 988
989 linep->touch ();
990
990 while (*tp == NOCHAR && tp > line->t) 991 while (*tp == NOCHAR && tp > linep->t)
991 tp--, rp--; 992 tp--, rp--;
993
994 // first try to find a precomposed character
995 unicode_t n = rxvt_compose (*tp, c);
996 if (n == NOCHAR)
997 n = rxvt_composite.compose (*tp, c);
998
999 *tp = n;
1000 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
992 } 1001 }
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 } 1002 }
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 1003#endif
1015 }
1016 } 1004 }
1017 1005
1018 if (!line->is_longer ()) /* XXX: think about this */
1019 MAX_IT (line->l, screen.cur.col); 1006 max_it (line->l, screen.cur.col);
1020 1007
1021#ifdef DEBUG_STRICT
1022 assert (screen.cur.row >= 0); 1008 assert (screen.cur.row >= 0);
1023#else /* drive with your eyes closed */
1024 MAX_IT (screen.cur.row, 0);
1025#endif
1026} 1009}
1027 1010
1028/* ------------------------------------------------------------------------- */ 1011/* ------------------------------------------------------------------------- */
1029/* 1012/*
1030 * Process Backspace. Move back the cursor back a position, wrap if have to 1013 * Process Backspace. Move back the cursor back a position, wrap if have to
1031 * XTERM_SEQ: CTRL-H 1014 * XTERM_SEQ: CTRL-H
1032 */ 1015 */
1033void 1016void
1034rxvt_term::scr_backspace () 1017rxvt_term::scr_backspace () NOTHROW
1035{ 1018{
1036 want_refresh = 1;
1037
1038 if (screen.cur.col == 0) 1019 if (screen.cur.col == 0)
1039 { 1020 {
1040 if (screen.cur.row > 0) 1021 if (screen.cur.row > 0)
1041 { 1022 {
1042#ifdef TERMCAP_HAS_BW 1023#ifdef TERMCAP_HAS_BW
1043 screen.cur.col = ncol - 1; 1024 screen.cur.col = ncol - 1;
1044 screen.cur.row--; 1025 --screen.cur.row;
1045 return; 1026
1027 want_refresh = 1;
1046#endif 1028#endif
1047 } 1029 }
1048 } 1030 }
1049 else if (!(screen.flags & Screen_WrapNext)) 1031 else if (screen.flags & Screen_WrapNext)
1032 screen.flags &= ~Screen_WrapNext;
1033 else
1050 scr_gotorc (0, -1, RELATIVE); 1034 scr_gotorc (0, -1, RELATIVE);
1051
1052 screen.flags &= ~Screen_WrapNext;
1053} 1035}
1054 1036
1055/* ------------------------------------------------------------------------- */ 1037/* ------------------------------------------------------------------------- */
1056/* 1038/*
1057 * Process Horizontal Tab 1039 * Process Horizontal Tab
1058 * count: +ve = forward; -ve = backwards 1040 * count: +ve = forward; -ve = backwards
1059 * XTERM_SEQ: CTRL-I 1041 * XTERM_SEQ: CTRL-I
1060 */ 1042 */
1061void 1043void
1062rxvt_term::scr_tab (int count, bool ht) 1044rxvt_term::scr_tab (int count, bool ht) NOTHROW
1063{ 1045{
1064 int i, x; 1046 int i, x;
1065 1047
1066 want_refresh = 1; 1048 want_refresh = 1;
1067 i = x = screen.cur.col; 1049 i = x = screen.cur.col;
1068 1050
1069 if (count == 0) 1051 if (count == 0)
1070 return; 1052 return;
1071 else if (count > 0) 1053 else if (count > 0)
1072 { 1054 {
1073 int row = saveLines + screen.cur.row; 1055 line_t &l = ROW(screen.cur.row);
1074
1075 line_t &l = save[row];
1076 rend_t base_rend = l.r[i]; 1056 rend_t base_rend = l.r[i];
1077 ht &= l.t[i] == ' '; 1057 ht &= l.t[i] == ' ';
1078 1058
1079 for (; ++i < ncol; ) 1059 for (; ++i < ncol; )
1080 if (tabs[i]) 1060 if (tabs[i])
1081 { 1061 {
1082 x = i; 1062 x = i;
1063
1083 if (!--count) 1064 if (!--count)
1084 break; 1065 break;
1085 } 1066 }
1086 else 1067 else
1087 ht &= l.t[i] == ' ' 1068 ht &= l.t[i] == ' '
1088 && RS_SAME (l.r[i], base_rend); 1069 && RS_SAME (l.r[i], base_rend);
1089 1070
1090 if (count) 1071 if (count)
1091 x = ncol - 1; 1072 x = ncol - 1;
1092 1073
1093 // store horizontal tab commands as characters inside the text 1074 // store horizontal tab commands as characters inside the text
1094 // buffer so they can be selected and pasted. 1075 // buffer so they can be selected and pasted.
1095 if (ht && options & Opt_pastableTabs) 1076 if (ht && option (Opt_pastableTabs))
1096 { 1077 {
1097 base_rend = SET_FONT (base_rend, 0); 1078 base_rend = SET_FONT (base_rend, 0);
1098 1079
1099 if (!l.is_longer ()) /* XXX: think about this */ 1080 l.touch (x);
1100 MAX_IT (l.l, x);
1101 1081
1102 i = screen.cur.col; 1082 i = screen.cur.col;
1103 1083
1104 l.t[i] = '\t'; 1084 l.t[i] = '\t';
1105 l.r[i] = base_rend; 1085 l.r[i] = base_rend;
… …
1134 * Process DEC Back Index 1114 * Process DEC Back Index
1135 * XTERM_SEQ: ESC 6 1115 * XTERM_SEQ: ESC 6
1136 * Move cursor left in row. If we're at the left boundary, shift everything 1116 * Move cursor left in row. If we're at the left boundary, shift everything
1137 * in that row right. Clear left column. 1117 * in that row right. Clear left column.
1138 */ 1118 */
1139#if ENABLE_FRILLS 1119#if !ENABLE_MINIMAL
1140void 1120void
1141rxvt_term::scr_backindex () 1121rxvt_term::scr_backindex () NOTHROW
1142{ 1122{
1143 if (screen.cur.col > 0) 1123 if (screen.cur.col > 0)
1144 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1124 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1145 else 1125 else
1146 {
1147 if (!save[screen.cur.row + saveLines].l)
1148 return; /* um, yeah? */
1149
1150 scr_insdel_chars (1, INSERT); 1126 scr_insdel_chars (1, INSERT);
1151 }
1152} 1127}
1153#endif 1128#endif
1154/* ------------------------------------------------------------------------- */ 1129/* ------------------------------------------------------------------------- */
1155/* 1130/*
1156 * Process DEC Forward Index 1131 * Process DEC Forward Index
1157 * XTERM_SEQ: ESC 9 1132 * XTERM_SEQ: ESC 9
1158 * Move cursor right in row. If we're at the right boundary, shift everything 1133 * Move cursor right in row. If we're at the right boundary, shift everything
1159 * in that row left. Clear right column. 1134 * in that row left. Clear right column.
1160 */ 1135 */
1161#if ENABLE_FRILLS 1136#if !ENABLE_MINIMAL
1162void 1137void
1163rxvt_term::scr_forwardindex () 1138rxvt_term::scr_forwardindex () NOTHROW
1164{ 1139{
1165 int row;
1166
1167 if (screen.cur.col < ncol - 1) 1140 if (screen.cur.col < ncol - 1)
1168 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1141 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1169 else 1142 else
1170 { 1143 {
1171 row = screen.cur.row + saveLines; 1144 line_t &l = ROW(screen.cur.row);
1172 1145
1173 if (!save[row].l) 1146 l.touch ();
1174 return; /* um, yeah? */ 1147 l.is_longer (0);
1175
1176 if (save[row].is_longer ()) //TODO//FIXME//LEN
1177 save[row].l = ncol;
1178 1148
1179 scr_gotorc (0, 0, R_RELATIVE); 1149 scr_gotorc (0, 0, R_RELATIVE);
1180 scr_insdel_chars (1, DELETE); 1150 scr_insdel_chars (1, DELETE);
1181 scr_gotorc (0, ncol - 1, R_RELATIVE); 1151 scr_gotorc (0, ncol - 1, R_RELATIVE);
1182 } 1152 }
… …
1186/* ------------------------------------------------------------------------- */ 1156/* ------------------------------------------------------------------------- */
1187/* 1157/*
1188 * Goto Row/Column 1158 * Goto Row/Column
1189 */ 1159 */
1190void 1160void
1191rxvt_term::scr_gotorc (int row, int col, int relative) 1161rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1192{ 1162{
1193 want_refresh = 1; 1163 want_refresh = 1;
1194 ZERO_SCROLLBACK (); 1164 ZERO_SCROLLBACK ();
1195 1165
1196 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1166 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1197 MAX_IT (screen.cur.col, 0); 1167 clamp_it (screen.cur.col, 0, ncol - 1);
1198 MIN_IT (screen.cur.col, (int32_t)ncol - 1);
1199 1168
1200 screen.flags &= ~Screen_WrapNext; 1169 screen.flags &= ~Screen_WrapNext;
1201 1170
1202 if (relative & R_RELATIVE) 1171 if (relative & R_RELATIVE)
1203 { 1172 {
… …
1219 } 1188 }
1220 } 1189 }
1221 else 1190 else
1222 { 1191 {
1223 if (screen.flags & Screen_Relative) 1192 if (screen.flags & Screen_Relative)
1193 {
1224 { /* relative origin mode */ 1194 /* relative origin mode */
1225 screen.cur.row = row + screen.tscroll; 1195 screen.cur.row = row + screen.tscroll;
1226 MIN_IT (screen.cur.row, screen.bscroll); 1196 min_it (screen.cur.row, screen.bscroll);
1227 } 1197 }
1228 else 1198 else
1229 screen.cur.row = row; 1199 screen.cur.row = row;
1230 } 1200 }
1231 1201
1232 MAX_IT (screen.cur.row, 0); 1202 clamp_it (screen.cur.row, 0, nrow - 1);
1233 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1234} 1203}
1235 1204
1236/* ------------------------------------------------------------------------- */ 1205/* ------------------------------------------------------------------------- */
1237/* 1206/*
1238 * direction should be UP or DN 1207 * direction should be UP or DN
1239 */ 1208 */
1240void 1209void
1241rxvt_term::scr_index (enum page_dirn direction) 1210rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1242{ 1211{
1243 int dirn; 1212 int dirn;
1244 1213
1245 want_refresh = 1; 1214 want_refresh = 1;
1246 ZERO_SCROLLBACK (); 1215 ZERO_SCROLLBACK ();
… …
1249 1218
1250 screen.flags &= ~Screen_WrapNext; 1219 screen.flags &= ~Screen_WrapNext;
1251 1220
1252 if ((screen.cur.row == screen.bscroll && direction == UP) 1221 if ((screen.cur.row == screen.bscroll && direction == UP)
1253 || (screen.cur.row == screen.tscroll && direction == DN)) 1222 || (screen.cur.row == screen.tscroll && direction == DN))
1254 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1223 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1255 else 1224 else
1256 screen.cur.row += dirn; 1225 screen.cur.row += dirn;
1257 1226
1258 MAX_IT (screen.cur.row, 0); 1227 clamp_it (screen.cur.row, 0, nrow - 1);
1259 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1260 selection_check (0); 1228 selection_check (0);
1261} 1229}
1262 1230
1263/* ------------------------------------------------------------------------- */ 1231/* ------------------------------------------------------------------------- */
1264/* 1232/*
1265 * Erase part or whole of a line 1233 * Erase part or whole of a line
1266 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1234 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1267 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1235 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1268 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1236 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1237 * extension: clear to right unless wrapped: ESC [ 3 K
1269 */ 1238 */
1270void 1239void
1271rxvt_term::scr_erase_line (int mode) 1240rxvt_term::scr_erase_line (int mode) NOTHROW
1272{ 1241{
1273 unsigned int row, col, num; 1242 unsigned int col, num;
1274 1243
1275 want_refresh = 1; 1244 want_refresh = 1;
1276 ZERO_SCROLLBACK (); 1245 ZERO_SCROLLBACK ();
1277 1246
1278 selection_check (1); 1247 selection_check (1);
1279 1248
1280 row = saveLines + screen.cur.row; 1249 line_t &line = ROW(screen.cur.row);
1250
1251 line.touch ();
1252 line.is_longer (0);
1281 1253
1282 switch (mode) 1254 switch (mode)
1283 { 1255 {
1256 case 3:
1257 if (screen.flags & Screen_WrapNext)
1258 return;
1259
1260 /* fall through */
1261
1284 case 0: /* erase to end of line */ 1262 case 0: /* erase to end of line */
1285 col = screen.cur.col; 1263 col = screen.cur.col;
1286 num = ncol - col; 1264 num = ncol - col;
1287 MIN_IT (save[row].l, (int16_t)col); 1265 min_it (line.l, col);
1266
1288 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1267 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1289 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1268 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1290 CLEAR_SELECTION (); 1269 CLEAR_SELECTION ();
1291 break; 1270 break;
1271
1292 case 1: /* erase to beginning of line */ 1272 case 1: /* erase to beginning of line */
1293 col = 0; 1273 col = 0;
1294 num = screen.cur.col + 1; 1274 num = screen.cur.col + 1;
1275
1295 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1276 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1296 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1277 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1297 CLEAR_SELECTION (); 1278 CLEAR_SELECTION ();
1298 break; 1279 break;
1280
1299 case 2: /* erase whole line */ 1281 case 2: /* erase whole line */
1300 col = 0; 1282 col = 0;
1301 num = ncol; 1283 num = ncol;
1302 save[row].l = 0; 1284 line.l = 0;
1303 if (selection.beg.row <= screen.cur.row 1285 if (selection.beg.row <= screen.cur.row
1304 && selection.end.row >= screen.cur.row) 1286 && selection.end.row >= screen.cur.row)
1305 CLEAR_SELECTION (); 1287 CLEAR_SELECTION ();
1306 break; 1288 break;
1307 default: 1289 default:
1308 return; 1290 return;
1309 } 1291 }
1310 1292
1311 if (save[row].t)
1312 scr_blank_line (save[row], col, num, rstyle); 1293 scr_blank_line (line, col, num, rstyle);
1313 else
1314 scr_blank_screen_mem (save[row], rstyle);
1315} 1294}
1316 1295
1317/* ------------------------------------------------------------------------- */ 1296/* ------------------------------------------------------------------------- */
1318/* 1297/*
1319 * Erase part of whole of the screen 1298 * Erase part of whole of the screen
1320 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1299 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1321 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1300 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1322 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1301 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1323 */ 1302 */
1324void 1303void
1325rxvt_term::scr_erase_screen (int mode) 1304rxvt_term::scr_erase_screen (int mode) NOTHROW
1326{ 1305{
1327 int num; 1306 int num;
1328 int32_t row, row_offset; 1307 int32_t row;
1329 rend_t ren; 1308 rend_t ren;
1330 XGCValues gcvalue; 1309 XGCValues gcvalue;
1331 1310
1332 want_refresh = 1; 1311 want_refresh = 1;
1333 ZERO_SCROLLBACK (); 1312 ZERO_SCROLLBACK ();
1334
1335 row_offset = (int32_t)saveLines;
1336 1313
1337 switch (mode) 1314 switch (mode)
1338 { 1315 {
1339 case 0: /* erase to end of screen */ 1316 case 0: /* erase to end of screen */
1340 selection_check (1); 1317 selection_check (1);
… …
1364 CLEAR_SELECTION (); 1341 CLEAR_SELECTION ();
1365 1342
1366 if (row >= nrow) /* Out Of Bounds */ 1343 if (row >= nrow) /* Out Of Bounds */
1367 return; 1344 return;
1368 1345
1369 MIN_IT (num, (nrow - row)); 1346 min_it (num, nrow - row);
1370 1347
1371 if (rstyle & (RS_RVid | RS_Uline)) 1348 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1372 ren = (rend_t) ~RS_None; 1349 ren = (rend_t) ~RS_None;
1373 else if (GET_BASEBG (rstyle) == Color_bg) 1350 else if (GET_BASEBG (rstyle) == Color_bg)
1374 { 1351 {
1375 ren = DEFAULT_RSTYLE; 1352 ren = DEFAULT_RSTYLE;
1376 CLEAR_ROWS (row, num); 1353
1354 if (mapped)
1355 XClearArea (dpy, vt, 0,
1356 Row2Pixel (row - view_start), (unsigned int)width,
1357 (unsigned int)Height2Pixel (num), False);
1377 } 1358 }
1378 else 1359 else
1379 { 1360 {
1380 ren = rstyle & (RS_fgMask | RS_bgMask); 1361 ren = rstyle & (RS_fgMask | RS_bgMask);
1362
1363 if (mapped)
1364 {
1381 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1365 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1382 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1366 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1383 ERASE_ROWS (row, num); 1367 XFillRectangle (dpy, vt, gc,
1368 0, Row2Pixel (row - view_start),
1369 (unsigned int)width,
1370 (unsigned int)Height2Pixel (num));
1384 gcvalue.foreground = pix_colors[Color_fg]; 1371 gcvalue.foreground = pix_colors[Color_fg];
1385 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1372 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1373 }
1386 } 1374 }
1387 1375
1388 for (; num--; row++) 1376 for (; num--; row++)
1389 { 1377 {
1390 scr_blank_screen_mem (save[row + row_offset], rstyle); 1378 scr_blank_screen_mem (ROW(row), rstyle);
1391 save[row + row_offset].l = 0; 1379
1380 if (row - view_start < nrow)
1392 scr_blank_line (drawn[row], 0, ncol, ren); 1381 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1393 } 1382 }
1394} 1383}
1395 1384
1396#if ENABLE_FRILLS 1385#if !ENABLE_MINIMAL
1397void 1386void
1398rxvt_term::scr_erase_savelines () 1387rxvt_term::scr_erase_savelines () NOTHROW
1399{ 1388{
1400 want_refresh = 1; 1389 want_refresh = 1;
1401 ZERO_SCROLLBACK (); 1390 ZERO_SCROLLBACK ();
1402 1391
1403 nscrolled = 0; 1392 top_row = 0;
1404} 1393}
1405#endif 1394#endif
1406 1395
1407/* ------------------------------------------------------------------------- */ 1396/* ------------------------------------------------------------------------- */
1408/* 1397/*
1409 * Fill the screen with `E's 1398 * Fill the screen with `E's
1410 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1399 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1411 */ 1400 */
1412void 1401void
1413rxvt_term::scr_E () 1402rxvt_term::scr_E () NOTHROW
1414{ 1403{
1415 int i, j, k;
1416 rend_t *r1, fs; 1404 rend_t fs;
1417 1405
1418 want_refresh = 1; 1406 want_refresh = 1;
1419 ZERO_SCROLLBACK (); 1407 ZERO_SCROLLBACK ();
1420 1408
1421 num_scr_allow = 0; 1409 num_scr_allow = 0;
1422 selection_check (3); 1410 selection_check (3);
1423 1411
1424 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1412 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1425 for (k = saveLines, i = nrow; i--; k++) 1413 for (int row = nrow; row--; )
1426 { 1414 {
1427 line_t &line = save[k]; 1415 line_t &line = ROW(row);
1428 1416
1429 fill_text (line.t, 'E', ncol); 1417 fill_text (line.t, 'E', ncol);
1418 rend_t *r1 = line.r;
1430 1419
1431 for (r1 = line.r, j = ncol; j--; ) 1420 for (int j = ncol; j--; )
1432 *r1++ = fs; 1421 *r1++ = fs;
1433 1422
1434 line.l = ncol; /* make the `E's selectable */ 1423 line.is_longer (0);
1424 line.touch (ncol);
1435 } 1425 }
1436} 1426}
1437 1427
1438/* ------------------------------------------------------------------------- */ 1428/* ------------------------------------------------------------------------- */
1439/* 1429/*
1440 * Insert/Delete <count> lines 1430 * Insert/Delete <count> lines
1441 */ 1431 */
1442void 1432void
1443rxvt_term::scr_insdel_lines (int count, int insdel) 1433rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1444{ 1434{
1445 int end; 1435 int end;
1446 1436
1447 ZERO_SCROLLBACK (); 1437 ZERO_SCROLLBACK ();
1448 1438
… …
1460 count = end; 1450 count = end;
1461 } 1451 }
1462 1452
1463 scr_do_wrap (); 1453 scr_do_wrap ();
1464 1454
1465 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1455 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count);
1466} 1456}
1467 1457
1468/* ------------------------------------------------------------------------- */ 1458/* ------------------------------------------------------------------------- */
1469/* 1459/*
1470 * Insert/Delete <count> characters from the current position 1460 * Insert/Delete <count> characters from the current position
1471 */ 1461 */
1472void 1462void
1473rxvt_term::scr_insdel_chars (int count, int insdel) 1463rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1474{ 1464{
1475 int col, row;
1476 rend_t tr;
1477
1478 want_refresh = 1; 1465 want_refresh = 1;
1479 ZERO_SCROLLBACK (); 1466 ZERO_SCROLLBACK ();
1480 1467
1481 if (count <= 0) 1468 if (count <= 0)
1482 return; 1469 return;
1483 1470
1484 scr_do_wrap (); 1471 scr_do_wrap ();
1485 1472
1486 selection_check (1); 1473 selection_check (1);
1487 MIN_IT (count, (ncol - screen.cur.col)); 1474 min_it (count, ncol - screen.cur.col);
1488 1475
1489 row = screen.cur.row + saveLines; 1476 int row = screen.cur.row;
1490 1477
1491 line_t *line = save + row; 1478 line_t *line = &ROW(row);
1479
1480 line->touch ();
1481 line->is_longer (0);
1482
1483 // nuke wide spanning the start
1484 if (line->t[screen.cur.col] == NOCHAR)
1485 scr_kill_char (*line, screen.cur.col);
1492 1486
1493 switch (insdel) 1487 switch (insdel)
1494 { 1488 {
1495 case INSERT: 1489 case INSERT:
1496 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1490 line->l = min (line->l + count, ncol);
1491
1492 if (line->t[screen.cur.col] == NOCHAR)
1493 scr_kill_char (*line, screen.cur.col);
1494
1495 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1497 { 1496 {
1498 line->t[col] = line->t[col - count]; 1497 line->t[col] = line->t[col - count];
1499 line->r[col] = line->r[col - count]; 1498 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 } 1499 }
1507 1500
1508 if (selection.op && current_screen == selection.screen 1501 if (selection.op && current_screen == selection.screen
1509 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1502 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1510 { 1503 {
1511 if (selection.end.row != screen.cur.row 1504 if (selection.end.row != screen.cur.row
1512 || (selection.end.col + count >= ncol)) 1505 || (selection.end.col + count >= ncol))
1513 CLEAR_SELECTION (); 1506 CLEAR_SELECTION ();
1514 else 1507 else
1508 {
1515 { /* shift selection */ 1509 /* shift selection */
1516 selection.beg.col += count; 1510 selection.beg.col += count;
1517 selection.mark.col += count; /* XXX: yes? */ 1511 selection.mark.col += count; /* XXX: yes? */
1518 selection.end.col += count; 1512 selection.end.col += count;
1519 } 1513 }
1520 } 1514 }
1521 1515
1522 scr_blank_line (save[row], screen.cur.col, count, rstyle); 1516 scr_blank_line (*line, screen.cur.col, count, rstyle);
1523 break; 1517 break;
1524 1518
1525 case ERASE: 1519 case ERASE:
1526 screen.cur.col += count; /* don't worry if > ncol */ 1520 screen.cur.col += count; /* don't worry if > ncol */
1527 selection_check (1); 1521 selection_check (1);
1528 screen.cur.col -= count; 1522 screen.cur.col -= count;
1523
1524 // nuke wide char after the end
1525 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1526 scr_kill_char (*line, screen.cur.col + count);
1527
1529 scr_blank_line (save[row], screen.cur.col, count, rstyle); 1528 scr_blank_line (*line, screen.cur.col, count, rstyle);
1530 break; 1529 break;
1531 1530
1532 case DELETE: 1531 case DELETE:
1533 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1532 line->l = max (line->l - count, 0);
1534 1533
1534 // nuke wide char spanning the end
1535 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1536 scr_kill_char (*line, screen.cur.col + count);
1537
1535 for (col = screen.cur.col; (col + count) < ncol; col++) 1538 for (int col = screen.cur.col; (col + count) < ncol; col++)
1536 { 1539 {
1537 line->t[col] = line->t[col + count]; 1540 line->t[col] = line->t[col + count];
1538 line->r[col] = line->r[col + count]; 1541 line->r[col] = line->r[col + count];
1539 } 1542 }
1540 1543
1541 scr_blank_line (*line, ncol - count, count, tr); 1544 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 1545
1549 if (selection.op && current_screen == selection.screen 1546 if (selection.op && current_screen == selection.screen
1550 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1547 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1551 { 1548 {
1552 if (selection.end.row != screen.cur.row 1549 if (selection.end.row != screen.cur.row
… …
1570/* 1567/*
1571 * Set the scrolling region 1568 * Set the scrolling region
1572 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1569 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1573 */ 1570 */
1574void 1571void
1575rxvt_term::scr_scroll_region (int top, int bot) 1572rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1576{ 1573{
1577 MAX_IT (top, 0); 1574 max_it (top, 0);
1578 MIN_IT (bot, (int)nrow - 1); 1575 min_it (bot, nrow - 1);
1579 1576
1580 if (top > bot) 1577 if (top > bot)
1581 return; 1578 return;
1582 1579
1583 screen.tscroll = top; 1580 screen.tscroll = top;
… …
1590 * Make the cursor visible/invisible 1587 * Make the cursor visible/invisible
1591 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1588 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1592 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1589 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1593 */ 1590 */
1594void 1591void
1595rxvt_term::scr_cursor_visible (int mode) 1592rxvt_term::scr_cursor_visible (int mode) NOTHROW
1596{ 1593{
1597 want_refresh = 1; 1594 want_refresh = 1;
1598 1595
1599 if (mode) 1596 if (mode)
1600 screen.flags |= Screen_VisibleCursor; 1597 screen.flags |= Screen_VisibleCursor;
… …
1607 * Set/unset automatic wrapping 1604 * Set/unset automatic wrapping
1608 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1605 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1609 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1606 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1610 */ 1607 */
1611void 1608void
1612rxvt_term::scr_autowrap (int mode) 1609rxvt_term::scr_autowrap (int mode) NOTHROW
1613{ 1610{
1614 if (mode) 1611 if (mode)
1615 screen.flags |= Screen_Autowrap; 1612 screen.flags |= Screen_Autowrap;
1616 else 1613 else
1617 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1614 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1626 * and the cursor cannot be moved outside. 1623 * and the cursor cannot be moved outside.
1627 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1624 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1628 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1625 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1629 */ 1626 */
1630void 1627void
1631rxvt_term::scr_relative_origin (int mode) 1628rxvt_term::scr_relative_origin (int mode) NOTHROW
1632{ 1629{
1633 if (mode) 1630 if (mode)
1634 screen.flags |= Screen_Relative; 1631 screen.flags |= Screen_Relative;
1635 else 1632 else
1636 screen.flags &= ~Screen_Relative; 1633 screen.flags &= ~Screen_Relative;
… …
1643 * Set insert/replace mode 1640 * Set insert/replace mode
1644 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1641 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1645 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1642 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1646 */ 1643 */
1647void 1644void
1648rxvt_term::scr_insert_mode (int mode) 1645rxvt_term::scr_insert_mode (int mode) NOTHROW
1649{ 1646{
1650 if (mode) 1647 if (mode)
1651 screen.flags |= Screen_Insert; 1648 screen.flags |= Screen_Insert;
1652 else 1649 else
1653 screen.flags &= ~Screen_Insert; 1650 screen.flags &= ~Screen_Insert;
… …
1659 * XTERM_SEQ: Set tab at current column : ESC H 1656 * XTERM_SEQ: Set tab at current column : ESC H
1660 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1657 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1661 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1658 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1662 */ 1659 */
1663void 1660void
1664rxvt_term::scr_set_tab (int mode) 1661rxvt_term::scr_set_tab (int mode) NOTHROW
1665{ 1662{
1666 if (mode < 0) 1663 if (mode < 0)
1667 memset (tabs, 0, ncol * sizeof (char)); 1664 memset (tabs, 0, ncol);
1668 else if (screen.cur.col < ncol) 1665 else if (screen.cur.col < ncol)
1669 tabs[screen.cur.col] = (mode ? 1 : 0); 1666 tabs [screen.cur.col] = !!mode;
1670} 1667}
1671 1668
1672/* ------------------------------------------------------------------------- */ 1669/* ------------------------------------------------------------------------- */
1673/* 1670/*
1674 * Set reverse/normal video 1671 * Set reverse/normal video
1675 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1672 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1676 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1673 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1677 */ 1674 */
1678void 1675void
1679rxvt_term::scr_rvideo_mode (int mode) 1676rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1680{ 1677{
1681 XGCValues gcvalue; 1678 rvideo_mode = on;
1682 1679
1680#ifndef NO_BELL
1681 on ^= rvideo_bell;
1682#endif
1683
1683 if (rvideo != mode) 1684 if (rvideo_state != on)
1684 { 1685 {
1685 rvideo = mode; 1686 rvideo_state = on;
1687
1686 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); 1688 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1687#if XPM_BACKGROUND 1689#ifdef HAVE_BG_PIXMAP
1688 if (bgPixmap.pixmap == None) 1690 if (bgPixmap.pixmap == None)
1689#endif 1691#endif
1690#if TRANSPARENT 1692 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 1693
1694 XGCValues gcvalue;
1696 gcvalue.foreground = pix_colors[Color_fg]; 1695 gcvalue.foreground = pix_colors[Color_fg];
1697 gcvalue.background = pix_colors[Color_bg]; 1696 gcvalue.background = pix_colors[Color_bg];
1698 XChangeGC (display->display, gc, GCBackground | GCForeground, 1697 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1699 &gcvalue); 1698
1700 scr_clear (); 1699 scr_clear ();
1701 scr_touch (true); 1700 scr_touch (true);
1702 } 1701 }
1703} 1702}
1704 1703
… …
1706/* 1705/*
1707 * Report current cursor position 1706 * Report current cursor position
1708 * XTERM_SEQ: Report position: ESC [ 6 n 1707 * XTERM_SEQ: Report position: ESC [ 6 n
1709 */ 1708 */
1710void 1709void
1711rxvt_term::scr_report_position () 1710rxvt_term::scr_report_position () NOTHROW
1712{ 1711{
1713 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1712 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1714} 1713}
1715 1714
1716/* ------------------------------------------------------------------------- * 1715/* ------------------------------------------------------------------------- *
… …
1719 1718
1720/* 1719/*
1721 * Set font style 1720 * Set font style
1722 */ 1721 */
1723void 1722void
1724rxvt_term::set_font_style () 1723rxvt_term::set_font_style () NOTHROW
1725{ 1724{
1725#if 0
1726 switch (charsets[screen.charset]) 1726 switch (charsets [screen.charset])
1727 { 1727 {
1728 case '0': /* DEC Special Character & Line Drawing Set */ 1728 case '0': /* DEC Special Character & Line Drawing Set */
1729 break; 1729 break;
1730 case 'A': /* United Kingdom (UK) */ 1730 case 'A': /* United Kingdom (UK) */
1731 break; 1731 break;
… …
1738 case 'C': /* Finnish character set */ 1738 case 'C': /* Finnish character set */
1739 break; 1739 break;
1740 case 'K': /* German character set */ 1740 case 'K': /* German character set */
1741 break; 1741 break;
1742 } 1742 }
1743#endif
1743} 1744}
1744 1745
1745/* ------------------------------------------------------------------------- */ 1746/* ------------------------------------------------------------------------- */
1746/* 1747/*
1747 * Choose a font 1748 * Choose a font
… …
1749 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1750 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1750 * XTERM_SEQ: Invoke G2 character set: ESC N 1751 * XTERM_SEQ: Invoke G2 character set: ESC N
1751 * XTERM_SEQ: Invoke G3 character set: ESC O 1752 * XTERM_SEQ: Invoke G3 character set: ESC O
1752 */ 1753 */
1753void 1754void
1754rxvt_term::scr_charset_choose (int set) 1755rxvt_term::scr_charset_choose (int set) NOTHROW
1755{ 1756{
1756 screen.charset = set; 1757 screen.charset = set;
1757 set_font_style (); 1758 set_font_style ();
1758} 1759}
1759 1760
… …
1765 * XTERM_SEQ: Set G2 character set: ESC * <C> 1766 * XTERM_SEQ: Set G2 character set: ESC * <C>
1766 * XTERM_SEQ: Set G3 character set: ESC + <C> 1767 * XTERM_SEQ: Set G3 character set: ESC + <C>
1767 * See set_font_style for possible values for <C> 1768 * See set_font_style for possible values for <C>
1768 */ 1769 */
1769void 1770void
1770rxvt_term::scr_charset_set (int set, unsigned int ch) 1771rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1771{ 1772{
1772 charsets[set] = (unsigned char)ch; 1773 charsets[set] = (unsigned char)ch;
1773 set_font_style (); 1774 set_font_style ();
1774} 1775}
1775 1776
… …
1780 1781
1781/* 1782/*
1782 * refresh matching text. 1783 * refresh matching text.
1783 */ 1784 */
1784bool 1785bool
1785rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1786rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1786{ 1787{
1787 bool found = false; 1788 bool found = false;
1788 1789
1789 for (int i = 0; i < nrow; i++) 1790 for (int i = 0; i < nrow; i++)
1790 { 1791 {
1791 int col = 0;
1792 rend_t *drp = drawn[i].r; 1792 rend_t *drp = drawn_buf[i].r;
1793 1793
1794 for (; col < ncol; col++, drp++) 1794 for (int col = 0; col < ncol; col++, drp++)
1795 if ((*drp & mask) == value) 1795 if ((*drp & mask) == value)
1796 { 1796 {
1797 found = true; 1797 found = true;
1798 *drp = ~value; 1798 *drp = ~value;
1799 } 1799 }
… …
1810 PART_END, 1810 PART_END,
1811 RC_COUNT 1811 RC_COUNT
1812}; 1812};
1813 1813
1814void 1814void
1815rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1815rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1816{ 1816{
1817 int i; 1817 int i;
1818 row_col_t rc[RC_COUNT]; 1818 row_col_t rc[RC_COUNT];
1819 1819
1820 if (!drawn) /* sanity check */ 1820 if (!drawn_buf) /* sanity check */
1821 return; 1821 return;
1822 1822
1823#ifndef NO_SLOW_LINK_SUPPORT 1823#ifndef NO_SLOW_LINK_SUPPORT
1824 if (refresh_type == FAST_REFRESH && !display->is_local) 1824 if (refresh_type == FAST_REFRESH && !display->is_local)
1825 { 1825 {
1826 y = 0; 1826 y = 0;
1827 eheight = height; 1827 eheight = height;
1828 } 1828 }
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 1829#endif
1837 1830
1838 /* round down */ 1831 /* round down */
1839 rc[PART_BEG].col = Pixel2Col (x); 1832 rc[PART_BEG].col = Pixel2Col (x);
1840 rc[PART_BEG].row = Pixel2Row (y); 1833 rc[PART_BEG].row = Pixel2Row (y);
… …
1843 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1); 1836 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1844 1837
1845 /* sanity checks */ 1838 /* sanity checks */
1846 for (i = PART_BEG; i < RC_COUNT; i++) 1839 for (i = PART_BEG; i < RC_COUNT; i++)
1847 { 1840 {
1848 MIN_IT (rc[i].col, ncol - 1); 1841 min_it (rc[i].col, ncol - 1);
1849 MIN_IT (rc[i].row, nrow - 1); 1842 min_it (rc[i].row, nrow - 1);
1850 } 1843 }
1851 1844
1852 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1845 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1853 fill_text (&drawn[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1846 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1847
1848 num_scr_allow = 0;
1854 1849
1855 if (refresh) 1850 if (refresh)
1856 scr_refresh (SLOW_REFRESH); 1851 scr_refresh ();
1857} 1852}
1858 1853
1859/* ------------------------------------------------------------------------- */ 1854/* ------------------------------------------------------------------------- */
1860/* 1855/*
1861 * Refresh the entire screen 1856 * Refresh the entire screen
1862 */ 1857 */
1863void 1858void
1864rxvt_term::scr_touch (bool refresh) 1859rxvt_term::scr_touch (bool refresh) NOTHROW
1865{ 1860{
1866 scr_expose (0, 0, width, height, refresh); 1861 scr_expose (0, 0, width, height, refresh);
1867} 1862}
1868 1863
1869/* ------------------------------------------------------------------------- */ 1864/* ------------------------------------------------------------------------- */
1870/* 1865/*
1871 * Move the display so that the line represented by scrollbar value Y is at 1866 * Move the display so that the line represented by scrollbar value Y is at
1872 * the top of the screen 1867 * the top of the screen
1873 */ 1868 */
1874int 1869void
1875rxvt_term::scr_move_to (int y, int len) 1870rxvt_term::scr_move_to (int y, int len) NOTHROW
1876{ 1871{
1877 long p = 0; 1872 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} 1873}
1893 1874
1894/* ------------------------------------------------------------------------- */ 1875/* ------------------------------------------------------------------------- */
1895/* 1876/*
1896 * Page the screen up/down nlines 1877 * Page the screen up/down nlines
1897 * direction should be UP or DN 1878 * direction should be UP or DN
1898 */ 1879 */
1899int 1880bool
1900rxvt_term::scr_page (enum page_dirn direction, int nlines) 1881rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1901{ 1882{
1902 int n; 1883 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; 1884 direction == UP ? view_start - nlines
1915 view_start = max (n, 0); 1885 : view_start + nlines;
1916 }
1917 1886
1918 return scr_changeview (oldviewstart); 1887 return scr_changeview (new_view_start);
1919} 1888}
1920 1889
1921int 1890bool
1922rxvt_term::scr_changeview (unsigned int oldviewstart) 1891rxvt_term::scr_changeview (int new_view_start) NOTHROW
1923{ 1892{
1893 clamp_it (new_view_start, top_row, 0);
1894
1924 if (view_start != oldviewstart) 1895 if (new_view_start == view_start)
1925 { 1896 return false;
1897
1898 num_scr += new_view_start - view_start;
1899 view_start = new_view_start;
1926 want_refresh = 1; 1900 want_refresh = 1;
1927 num_scr -= (view_start - oldviewstart);
1928 }
1929 1901
1930 return (int) (view_start - oldviewstart); 1902 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1931}
1932 1903
1933/* ------------------------------------------------------------------------- */ 1904 return true;
1905}
1906
1907#ifndef NO_BELL
1934void 1908void
1909rxvt_term::bell_cb (ev::timer &w, int revents)
1910{
1911 rvideo_bell = false;
1912 scr_rvideo_mode (rvideo_mode);
1913 refresh_check ();
1914}
1915#endif
1916
1917/* ------------------------------------------------------------------------- */
1918void
1935rxvt_term::scr_bell () 1919rxvt_term::scr_bell () NOTHROW
1936{ 1920{
1937#ifndef NO_BELL 1921#ifndef NO_BELL
1938 1922
1939# ifndef NO_MAPALERT 1923# ifndef NO_MAPALERT
1940# ifdef MAPALERT_OPTION 1924# ifdef MAPALERT_OPTION
1941 if (options & Opt_mapAlert) 1925 if (option (Opt_mapAlert))
1942# endif 1926# endif
1943 XMapWindow (display->display, parent[0]); 1927 XMapWindow (dpy, parent[0]);
1944# endif 1928# endif
1945 1929
1930# if ENABLE_FRILLS
1931 if (option (Opt_urgentOnBell))
1932 set_urgency (1);
1933# endif
1934
1946 if (options & Opt_visualBell) 1935 if (option (Opt_visualBell))
1947 { 1936 {
1948 scr_rvideo_mode (!rvideo); /* refresh also done */ 1937 rvideo_bell = true;
1938 scr_rvideo_mode (rvideo_mode);
1939 flush ();
1940
1949 rxvt_usleep (VISUAL_BELL_DURATION); 1941 bell_ev.start (VISUAL_BELL_DURATION);
1950 scr_rvideo_mode (!rvideo); /* refresh also done */
1951 } 1942 }
1952 else 1943 else
1953 XBell (display->display, 0); 1944 XBell (dpy, 0);
1954 1945 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1955#endif 1946#endif
1956} 1947}
1957 1948
1958/* ------------------------------------------------------------------------- */ 1949/* ------------------------------------------------------------------------- */
1959/* ARGSUSED */ 1950/* ARGSUSED */
1960void 1951void
1961rxvt_term::scr_printscreen (int fullhist) 1952rxvt_term::scr_printscreen (int fullhist) NOTHROW
1962{ 1953{
1963#ifdef PRINTPIPE 1954#ifdef PRINTPIPE
1964 int i, r1, nrows, row_offset; 1955 int nrows, row_start;
1965 FILE *fd; 1956 FILE *fd = popen_printer ();
1966 1957
1967 if ((fd = popen_printer ()) == NULL) 1958 if (!fd)
1968 return; 1959 return;
1969 1960
1970 nrows = nrow;
1971 row_offset = saveLines;
1972
1973 if (!fullhist) 1961 if (fullhist)
1974 row_offset -= view_start; 1962 {
1963 nrows = nrow - top_row;
1964 row_start = top_row;
1965 }
1975 else 1966 else
1976 { 1967 {
1977 nrows += nscrolled; 1968 nrows = nrow;
1978 row_offset -= nscrolled; 1969 row_start = view_start;
1979 } 1970 }
1980 1971
1981 wctomb (0, 0); 1972 wctomb (0, 0);
1982 1973
1983 for (r1 = 0; r1 < nrows; r1++) 1974 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1984 { 1975 {
1985 text_t *tp = save[r1 + row_offset].t; 1976 text_t *tp = ROW(r1).t;
1986 int len = save[r1 + row_offset].l; 1977 int len = ROW(r1).l;
1987 1978
1988 for (i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1979 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
1989 { 1980 {
1990 char mb[MB_LEN_MAX]; 1981 char mb[MB_LEN_MAX];
1991 text_t t = *tp++; 1982 text_t t = *tp++;
1992 if (t == NOCHAR) 1983 if (t == NOCHAR)
1993 continue; 1984 continue;
… …
2015 * Refresh the screen 2006 * Refresh the screen
2016 * drawn_text/drawn_rend contain the screen information before the update. 2007 * drawn_text/drawn_rend contain the screen information before the update.
2017 * screen.text/screen.rend contain what the screen will change to. 2008 * screen.text/screen.rend contain what the screen will change to.
2018 */ 2009 */
2019void 2010void
2020rxvt_term::scr_refresh (unsigned char refresh_type) 2011rxvt_term::scr_refresh () NOTHROW
2021{ 2012{
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 */ 2013 int16_t col, row, /* column/row we're processing */
2025 ocrow; /* old cursor row */ 2014 ocrow; /* old cursor row */
2026 int i, /* tmp */ 2015 int i; /* tmp */
2027 row_offset; /* basic offset in screen structure */
2028#ifndef NO_CURSORCOLOR 2016#ifndef NO_CURSORCOLOR
2029 rend_t cc1; /* store colours at cursor position (s) */ 2017 rend_t cc1; /* store colours at cursor position (s) */
2030#endif 2018#endif
2031 rend_t *crp; // cursor rendition pointer 2019 rend_t *crp; // cursor rendition pointer
2020 rend_t ccol1, /* Cursor colour */
2021 ccol2; /* Cursor colour2 */
2032 2022
2033 want_refresh = 0; /* screen is current */ 2023 want_refresh = 0; /* screen is current */
2034 2024
2035 if (refresh_type == NO_REFRESH || !mapped) 2025 if (refresh_type == NO_REFRESH || !mapped)
2036 return; 2026 return;
2037 2027
2038 /* 2028 /*
2039 * A: set up vars 2029 * A: set up vars
2040 */ 2030 */
2041 must_clear = 0;
2042 refresh_count = 0; 2031 refresh_count = 0;
2043 2032
2044 row_offset = saveLines - view_start; 2033 unsigned int old_screen_flags = screen.flags;
2045 2034 char have_bg = 0;
2046#if XPM_BACKGROUND 2035#ifdef HAVE_BG_PIXMAP
2047 must_clear |= bgPixmap.pixmap != None; 2036 have_bg = bgPixmap.pixmap != None;
2048#endif
2049#if TRANSPARENT
2050 must_clear |= (options & Opt_transparent) && am_transparent;
2051#endif 2037#endif
2052 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2053 2039
2054 /* 2040 /*
2055 * B: reverse any characters which are selected 2041 * B: reverse any characters which are selected
2056 */ 2042 */
2057 scr_reverse_selection (); 2043 scr_reverse_selection ();
2044
2045 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2046#if ENABLE_OVERLAY
2047 scr_swap_overlay ();
2048#endif
2049
2050 char showcursor = screen.flags & Screen_VisibleCursor;
2058 2051
2059 /* 2052 /*
2060 * C: set the cursor character (s) 2053 * C: set the cursor character (s)
2061 */ 2054 */
2062 { 2055 {
2063 unsigned char setoldcursor; 2056 unsigned char setoldcursor;
2064 rend_t ccol1, /* Cursor colour */
2065 ccol2; /* Cursor colour2 */
2066 2057
2067 showcursor = (screen.flags & Screen_VisibleCursor);
2068#ifdef CURSOR_BLINK 2058#ifdef CURSOR_BLINK
2069 if (hidden_cursor) 2059 if (hidden_cursor)
2070 showcursor = 0; 2060 showcursor = 0;
2071#endif 2061#endif
2072 2062
2073 if (showcursor) 2063 if (showcursor)
2074 { 2064 {
2075 int col = screen.cur.col; 2065 int col = screen.cur.col;
2076 2066
2077 while (col && screen.line[screen.cur.row]->t[col] == NOCHAR) 2067 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2078 col--; 2068 col--;
2079 2069
2080 crp = &screen.line[screen.cur.row]->r[col]; 2070 crp = &ROW(screen.cur.row).r[col];
2081 2071
2082 if (showcursor && focus) 2072#ifndef NO_CURSORCOLOR
2073 cc1 = *crp & (RS_fgMask | RS_bgMask);
2074 if (ISSET_PIXCOLOR (Color_cursor))
2075 ccol1 = Color_cursor;
2076 else
2077#endif
2078#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2079 ccol1 = fgcolor_of (rstyle);
2080#else
2081 ccol1 = Color_fg;
2082#endif
2083
2084#ifndef NO_CURSORCOLOR
2085 if (ISSET_PIXCOLOR (Color_cursor2))
2086 ccol2 = Color_cursor2;
2087 else
2088#endif
2089#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2090 ccol2 = bgcolor_of (rstyle);
2091#else
2092 ccol2 = Color_bg;
2093#endif
2094
2095 if (focus)
2083 { 2096 {
2084 if (options & Opt_cursorUnderline) 2097 if (option (Opt_cursorUnderline))
2085 *crp ^= RS_Uline; 2098 *crp ^= RS_Uline;
2086 else 2099 else
2087 { 2100 {
2088 *crp ^= RS_RVid; 2101 *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); 2102 *crp = SET_FGCOLOR (*crp, ccol1);
2109 *crp = SET_BGCOLOR (*crp, ccol2); 2103 *crp = SET_BGCOLOR (*crp, ccol2);
2110#endif
2111 } 2104 }
2112 } 2105 }
2113 } 2106 }
2114 2107
2115 /* make sure no outline cursor is left around */ 2108 /* make sure no outline cursor is left around */
2116 setoldcursor = 0; 2109 setoldcursor = 0;
2117 if (ocrow != -1) 2110 if (ocrow != -1)
2118 { 2111 {
2119 if (screen.cur.row + view_start != ocrow 2112 if (screen.cur.row - view_start != ocrow
2120 || screen.cur.col != oldcursor.col) 2113 || screen.cur.col != oldcursor.col)
2121 { 2114 {
2122 if (ocrow < nrow 2115 if (ocrow < nrow
2123 && oldcursor.col < ncol) 2116 && oldcursor.col < ncol)
2124 drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2117 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2125 2118
2126 if (focus || !showcursor) 2119 if (focus || !showcursor)
2127 oldcursor.row = -1; 2120 oldcursor.row = -1;
2128 else 2121 else
2129 setoldcursor = 1; 2122 setoldcursor = 1;
… …
2132 else if (!focus) 2125 else if (!focus)
2133 setoldcursor = 1; 2126 setoldcursor = 1;
2134 2127
2135 if (setoldcursor) 2128 if (setoldcursor)
2136 { 2129 {
2137 if (screen.cur.row + view_start >= nrow) 2130 if (screen.cur.row - view_start >= nrow)
2138 oldcursor.row = -1; 2131 oldcursor.row = -1;
2139 else 2132 else
2140 { 2133 {
2141 oldcursor.row = screen.cur.row + view_start; 2134 oldcursor.row = screen.cur.row - view_start;
2142 oldcursor.col = screen.cur.col; 2135 oldcursor.col = screen.cur.col;
2143 } 2136 }
2144 } 2137 }
2145 } 2138 }
2146
2147#if ENABLE_OVERLAY
2148 scr_swap_overlay ();
2149#endif
2150 2139
2151#ifndef NO_SLOW_LINK_SUPPORT 2140#ifndef NO_SLOW_LINK_SUPPORT
2152 /* 2141 /*
2153 * D: CopyArea pass - very useful for slower links 2142 * D: CopyArea pass - very useful for slower links
2154 * This has been deliberately kept simple. 2143 * This has been deliberately kept simple.
2155 */ 2144 */
2156 i = num_scr;
2157 if (!display->is_local 2145 if (!display->is_local
2158 && refresh_type == FAST_REFRESH && num_scr_allow && i 2146 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2159 && abs (i) < nrow && !must_clear) 2147 && abs (num_scr) < nrow && !have_bg)
2160 { 2148 {
2161 int16_t nits; 2149 int16_t nits;
2150 int i = num_scr;
2162 int j; 2151 int j;
2163 int len, wlen; 2152 int len, wlen;
2153 dLocal (int, num_scr);
2164 2154
2165 j = nrow; 2155 j = nrow;
2166 wlen = len = -1; 2156 wlen = len = -1;
2167 row = i > 0 ? 0 : j - 1; 2157 row = i > 0 ? 0 : j - 1;
2158
2168 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2159 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2169 { 2160 {
2170 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2161 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2171 { 2162 {
2172 line_t s = save[row + row_offset]; 2163 line_t s = ROW(view_start + row);
2173 line_t d = drawn[row]; 2164 line_t d = drawn_buf[row];
2174 line_t d2 = drawn[row + i]; 2165 line_t d2 = drawn_buf[row + i];
2175 2166
2176 for (nits = 0, col = ncol; col--; ) 2167 for (nits = 0, col = ncol; col--; )
2177 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2168 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2178 nits--; 2169 nits--;
2179 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col]) 2170 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
… …
2193 wlen = row; 2184 wlen = row;
2194 continue; 2185 continue;
2195 } 2186 }
2196 } 2187 }
2197 2188
2198 if (len != -1) 2189 if (len >= 0)
2199 { 2190 {
2200 /* also comes here at end if needed because of >= above */ 2191 /* also comes here at end if needed because of >= above */
2201 if (wlen < len) 2192 if (wlen < len)
2202 SWAP_IT (wlen, len, int); 2193 ::swap (wlen, len);
2203 2194
2195 XGCValues gcv;
2196
2197 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2204 XCopyArea (display->display, vt, vt, 2198 XCopyArea (dpy, vt, vt,
2205 gc, 0, Row2Pixel (len + i), 2199 gc, 0, Row2Pixel (len + i),
2206 (unsigned int)TermWin_TotalWidth (), 2200 (unsigned int)this->width,
2207 (unsigned int)Height2Pixel (wlen - len + 1), 2201 (unsigned int)Height2Pixel (wlen - len + 1),
2208 0, Row2Pixel (len)); 2202 0, Row2Pixel (len));
2203 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2204
2209 len = -1; 2205 len = -1;
2210 } 2206 }
2211 } 2207 }
2212 } 2208 }
2213#endif 2209#endif
… …
2215 /* 2211 /*
2216 * E: main pass across every character 2212 * E: main pass across every character
2217 */ 2213 */
2218 for (row = 0; row < nrow; row++) 2214 for (row = 0; row < nrow; row++)
2219 { 2215 {
2220 text_t *stp = save[row + row_offset].t; 2216 text_t *stp = ROW(view_start + row).t;
2221 rend_t *srp = save[row + row_offset].r; 2217 rend_t *srp = ROW(view_start + row).r;
2222 text_t *dtp = drawn[row].t; 2218 text_t *dtp = drawn_buf[row].t;
2223 rend_t *drp = drawn[row].r; 2219 rend_t *drp = drawn_buf[row].r;
2224 2220
2225 /* 2221 /*
2226 * E2: OK, now the real pass 2222 * E2: OK, now the real pass
2227 */ 2223 */
2228 int ypixel = (int)Row2Pixel (row); 2224 int ypixel = (int)Row2Pixel (row);
… …
2237 continue; 2233 continue;
2238 2234
2239 // redraw one or more characters 2235 // redraw one or more characters
2240 2236
2241 // seek to the beginning of wide characters 2237 // seek to the beginning of wide characters
2242 while (stp[col] == NOCHAR && col > 0) 2238 while (expect_false (stp[col] == NOCHAR && col > 0))
2243 --col; 2239 --col;
2244 2240
2245 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2241 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2246 text_t *text = stp + col; 2242 text_t *text = stp + col;
2247 int count = 1; 2243 int count = 1;
2248 2244
2249 dtp[col] = stp[col]; 2245 dtp[col] = stp[col];
2250 drp[col] = rend; 2246 drp[col] = rend;
… …
2254 for (i = 0; ++col < ncol; ) 2250 for (i = 0; ++col < ncol; )
2255 { 2251 {
2256 if (stp[col] == NOCHAR) 2252 if (stp[col] == NOCHAR)
2257 { 2253 {
2258 dtp[col] = stp[col]; 2254 dtp[col] = stp[col];
2259 drp[col] = rend; 2255 drp[col] = srp[col];
2256
2260 count++; 2257 count++;
2261 i++; 2258 i++;
2262 2259
2263 continue; 2260 continue;
2264 } 2261 }
… …
2269 count++; 2266 count++;
2270 2267
2271 if (stp[col] != dtp[col] 2268 if (stp[col] != dtp[col]
2272 || !RS_SAME (srp[col], drp[col])) 2269 || !RS_SAME (srp[col], drp[col]))
2273 { 2270 {
2274 if (must_clear && (i++ > count / 2)) 2271 if (have_bg && (i++ > count / 2))
2275 break; 2272 break;
2276 2273
2277 dtp[col] = stp[col]; 2274 dtp[col] = stp[col];
2278 drp[col] = rend; 2275 drp[col] = rend;
2279 i = 0; 2276 i = 0;
2280 } 2277 }
2281 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2278 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2282 break; 2279 break;
2283 } 2280 }
2284 2281
2285 col--; /* went one too far. move back */ 2282 col--; /* went one too far. move back */
2286 count -= i; /* dump any matching trailing chars */ 2283 count -= i; /* dump any matching trailing chars */
2287 2284
2288 // sometimes we optimize away the trailing NOCHAR's, add them back 2285 // sometimes we optimize away the trailing NOCHAR's, add them back
2289 while (i && text[count] == NOCHAR) 2286 while (expect_false (i && text[count] == NOCHAR))
2290 count++, i--; 2287 count++, i--;
2291 2288
2292 /* 2289 /*
2293 * Determine the attributes for the string 2290 * Determine the attributes for the string
2294 */ 2291 */
2295 int fore = GET_FGCOLOR (rend); // desired foreground 2292 int fore = fgcolor_of (rend); // desired foreground
2296 int back = GET_BGCOLOR (rend); // desired background 2293 int back = bgcolor_of (rend); // desired background
2297 2294
2298 // only do special processing if any attributes are set, which is rare 2295 // only do special processing if any attributes are set, which is unlikely
2299 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2296 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2300 { 2297 {
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; 2298 bool invert = rend & RS_RVid;
2314 2299
2315#ifndef NO_BOLD_UNDERLINE_REVERSE 2300#ifndef NO_BOLD_UNDERLINE_REVERSE
2316 if (rend & RS_Bold
2317 && fore == Color_fg) 2301 if (rend & RS_Bold && fore == Color_fg)
2318 { 2302 {
2319 if (ISSET_PIXCOLOR (Color_BD)) 2303 if (ISSET_PIXCOLOR (Color_BD))
2320 fore = Color_BD; 2304 fore = Color_BD;
2321# if !ENABLE_STYLES 2305# if !ENABLE_STYLES
2322 else 2306 else
2323 invert = !invert; 2307 invert = !invert;
2324# endif 2308# endif
2325 } 2309 }
2326 2310
2327 if (rend & RS_Italic 2311 if (rend & RS_Italic && fore == Color_fg)
2328 && fore == Color_fg)
2329 { 2312 {
2330 if (ISSET_PIXCOLOR (Color_IT)) 2313 if (ISSET_PIXCOLOR (Color_IT))
2331 fore = Color_IT; 2314 fore = Color_IT;
2332# if !ENABLE_STYLES 2315# if !ENABLE_STYLES
2333 else 2316 else
2334 invert = !invert; 2317 invert = !invert;
2335# endif 2318# endif
2336 } 2319 }
2337 2320
2338 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2321 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2339 fore = Color_UL; 2322 fore = Color_UL;
2323#endif
2324
2325#ifdef OPTION_HC
2326 if (rend & RS_Sel)
2327 {
2328 /* invert the column if no highlightColor is set or it is the
2329 * current cursor column */
2330 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2331 && ISSET_PIXCOLOR (Color_HC))
2332 {
2333 if (ISSET_PIXCOLOR (Color_HTC))
2334 fore = Color_HTC;
2335 // if invert is 0 reverse video is set so we use bg color as fg color
2336 else if (!invert)
2337 fore = back;
2338
2339 back = Color_HC;
2340 invert = 0;
2341 }
2342 }
2340#endif 2343#endif
2341 2344
2342 if (invert) 2345 if (invert)
2343 { 2346 {
2344 SWAP_IT (fore, back, int); 2347 ::swap (fore, back);
2345 2348
2346#ifndef NO_BOLD_UNDERLINE_REVERSE 2349#ifndef NO_BOLD_UNDERLINE_REVERSE
2347 if (ISSET_PIXCOLOR (Color_RV))
2348 back = Color_RV;
2349
2350 if (fore == back) 2350 if (fore == back)
2351 { 2351 {
2352 fore = Color_bg; 2352 fore = Color_bg;
2353 back = Color_fg; 2353 back = Color_fg;
2354 } 2354 }
… …
2356 } 2356 }
2357 2357
2358#ifdef TEXT_BLINK 2358#ifdef TEXT_BLINK
2359 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2359 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2360 { 2360 {
2361 if (!text_blink_ev.active) 2361 if (!text_blink_ev.is_active ())
2362 { 2362 {
2363 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2363 text_blink_ev.again ();
2364 hidden_text = 0; 2364 hidden_text = 0;
2365 } 2365 }
2366 else if (hidden_text) 2366 else if (hidden_text)
2367 fore = back; 2367 fore = back;
2368 } 2368 }
2369#endif 2369#endif
2370
2371#if ENABLE_STYLES
2372 // "careful" (too wide) character handling
2373
2374 // include previous careful character(s) if possible, looks nicer (best effort...)
2375 while (text > stp
2376 && srp[text - stp - 1] & RS_Careful
2377 && RS_SAME (rend, srp[text - stp - 1]))
2378 text--, count++, xpixel -= fwidth;
2379
2380 // force redraw after "careful" characters to avoid pixel droppings
2381 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2382 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2383
2384 // force redraw before "careful" characters to avoid pixel droppings
2385 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2386 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2387#endif
2370 } 2388 }
2371 2389
2372 /* 2390 /*
2373 * Actually do the drawing of the string here 2391 * Actually do the drawing of the string here
2374 */ 2392 */
2375 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2393 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2376 2394
2377 if (back == fore) 2395 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 { 2396 {
2383 if (must_clear) 2397 // this is very ugly, maybe push it into ->draw?
2384 {
2385 CLEAR_CHARS (xpixel, ypixel, count);
2386 2398
2387 for (i = 0; i < count; i++) /* don't draw empty strings */ 2399 for (i = 0; i < count; i++) /* don't draw empty strings */
2388 if (text[i] != ' ') 2400 if (text[i] != ' ')
2389 { 2401 {
2390 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2402 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2391 break; 2403 goto did_clear;
2392 }
2393 } 2404 }
2394 else 2405
2395 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2406 CLEAR_CHARS (xpixel, ypixel, count);
2407 did_clear: ;
2396 } 2408 }
2397 else 2409 else
2398 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2410 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2399 2411
2400 if (rend & RS_Uline && font->descent > 1 && fore != back) 2412 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2401 { 2413 {
2402#if ENABLE_FRILLS 2414#if ENABLE_FRILLS
2403 if (ISSET_PIXCOLOR (Color_underline)) 2415 if (ISSET_PIXCOLOR (Color_underline))
2404 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2416 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2405 else 2417 else
2406#endif 2418#endif
2407 XSetForeground (display->display, gc, pix_colors[fore]); 2419 XSetForeground (dpy, gc, pix_colors[fore]);
2408 2420
2409 XDrawLine (display->display, drawBuffer, gc, 2421 XDrawLine (dpy, vt, gc,
2410 xpixel, ypixel + font->ascent + 1, 2422 xpixel, ypixel + font->ascent + 1,
2411 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2423 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2412 } 2424 }
2413 } /* for (col....) */ 2425 } /* for (col....) */
2414 } /* for (row....) */ 2426 } /* for (row....) */
2415 2427
2416#if ENABLE_OVERLAY
2417 scr_swap_overlay ();
2418#endif
2419
2420 /* 2428 /*
2421 * G: cleanup cursor and display outline cursor if necessary 2429 * G: cleanup cursor and display outline cursor if necessary
2422 */ 2430 */
2423 if (showcursor) 2431 if (showcursor)
2424 { 2432 {
2425 if (focus) 2433 if (focus)
2426 { 2434 {
2427 if (options & Opt_cursorUnderline) 2435 if (option (Opt_cursorUnderline))
2428 *crp ^= RS_Uline; 2436 *crp ^= RS_Uline;
2429 else 2437 else
2430 { 2438 {
2431 *crp ^= RS_RVid; 2439 *crp ^= RS_RVid;
2432#ifndef NO_CURSORCOLOR 2440#ifndef NO_CURSORCOLOR
… …
2437 else if (oldcursor.row >= 0) 2445 else if (oldcursor.row >= 0)
2438 { 2446 {
2439 int cursorwidth = 1; 2447 int cursorwidth = 1;
2440 int col = oldcursor.col; 2448 int col = oldcursor.col;
2441 2449
2442 while (col && save[screen.cur.row + saveLines].t[col] == NOCHAR) 2450 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2443 col--; 2451 col--;
2444 2452
2445 while (col + cursorwidth < ncol 2453 while (col + cursorwidth < ncol
2446 && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2454 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2447 cursorwidth++; 2455 cursorwidth++;
2448 2456
2449#ifndef NO_CURSORCOLOR 2457#ifndef NO_CURSORCOLOR
2450 if (ISSET_PIXCOLOR (Color_cursor)) 2458 if (ISSET_PIXCOLOR (Color_cursor))
2451 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2459 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2460 else
2452#endif 2461#endif
2462 XSetForeground (dpy, gc, pix_colors[ccol1]);
2453 2463
2454 XDrawRectangle (display->display, drawBuffer, gc, 2464 XDrawRectangle (dpy, vt, gc,
2455 Col2Pixel (col), 2465 Col2Pixel (col),
2456 Row2Pixel (oldcursor.row), 2466 Row2Pixel (oldcursor.row),
2457 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2467 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2458 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2468 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2459 } 2469 }
2460 } 2470 }
2461 2471
2462 /* 2472 /*
2463 * H: cleanup selection 2473 * H: cleanup selection
2464 */ 2474 */
2475#if ENABLE_OVERLAY
2476 scr_swap_overlay ();
2477#endif
2478 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2479
2465 scr_reverse_selection (); 2480 scr_reverse_selection ();
2466 2481
2467 if (refresh_type & SMOOTH_REFRESH) 2482 screen.flags = old_screen_flags;
2468 XFlush (display->display);
2469
2470 num_scr = 0; 2483 num_scr = 0;
2471 num_scr_allow = 1; 2484 num_scr_allow = 1;
2472} 2485}
2473 2486
2474void 2487void
2475rxvt_term::scr_remap_chars (const line_t &l) 2488rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2476{ 2489{
2477 if (!l.t) 2490 if (!l.t)
2478 return; 2491 return;
2479 2492
2493 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2494
2480 for (int i = ncol; i--; ) 2495 for (int i = ncol; i--; )
2481 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2496 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2482} 2497}
2483 2498
2484void 2499void
2485rxvt_term::scr_remap_chars () 2500rxvt_term::scr_remap_chars () NOTHROW
2486{ 2501{
2487 for (int i = nrow + saveLines; i--; ) 2502 for (int i = total_rows; i--; )
2488 scr_remap_chars (save[i]); 2503 scr_remap_chars (row_buf [i]);
2489 2504
2490 for (int i = nrow; i--; ) 2505 for (int i = nrow; i--; )
2491 { 2506 {
2492 scr_remap_chars (drawn[i]); 2507 scr_remap_chars (drawn_buf [i]);
2493 scr_remap_chars (swap_save[i]); 2508 scr_remap_chars (swap_buf [i]);
2494 } 2509 }
2495} 2510}
2496 2511
2497void 2512void
2498rxvt_term::scr_recolour () 2513rxvt_term::scr_recolour () NOTHROW
2499{ 2514{
2500 if (1 2515#ifdef HAVE_BG_PIXMAP
2501#if TRANSPARENT 2516 bgPixmap.apply ();
2502 && !am_transparent 2517#else
2503#endif 2518
2504#if XPM_BACKGROUND
2505 && !bgPixmap.pixmap
2506#endif
2507 )
2508 {
2509 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2519 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2510 XClearWindow (display->display, parent[0]); 2520 XClearWindow (dpy, parent[0]);
2511 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2521 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2512#if HAVE_SCROLLBARS 2522
2513 if (scrollBar.win) 2523 if (scrollBar.win)
2514 { 2524 {
2515 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2525 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2516 scrollBar.setIdle (); 2526 scrollBar.state = STATE_IDLE;
2517 scrollbar_show (0); 2527 scrollBar.show (0);
2518 }
2519#endif
2520 } 2528 }
2521 2529
2530#endif
2531
2532 /* bgPixmap.apply () does not do the following : */
2522 scr_clear (); 2533 scr_clear ();
2523 scr_touch (true); 2534 scr_touch (true);
2524 want_refresh = 1; 2535 want_refresh = 1;
2525} 2536}
2526 2537
2527/* ------------------------------------------------------------------------- */ 2538/* ------------------------------------------------------------------------- */
2528void 2539void
2529rxvt_term::scr_clear (bool really) 2540rxvt_term::scr_clear (bool really) NOTHROW
2530{ 2541{
2531 if (!mapped) 2542 if (!mapped)
2532 return; 2543 return;
2533 2544
2534 num_scr_allow = 0; 2545 num_scr_allow = 0;
2535 want_refresh = 1; 2546 want_refresh = 1;
2536 2547
2537 if (really) 2548 if (really)
2538 XClearWindow (display->display, vt); 2549 XClearWindow (dpy, vt);
2539} 2550}
2540 2551
2541/* ------------------------------------------------------------------------- */
2542void 2552void
2553rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2554{
2555 int view_end = view_start + nrow;
2556 int row, col;
2557
2558 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2559 {
2560 text_t *stp = ROW(row).t;
2561 rend_t *srp = ROW(row).r;
2562
2563 for (col = beg_col; col < end_col; col++)
2564 srp[col] ^= rstyle1;
2565
2566 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2567 srp[col] ^= rstyle2;
2568
2569 if (++col < end_col)
2570 srp[col] ^= rstyle2;
2571 }
2572}
2573
2574void
2575rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2576{
2577 int view_end = view_start + nrow;
2578 int row, col;
2579
2580 if (beg_row >= view_start)
2581 {
2582 col = beg_col;
2583 row = beg_row;
2584 }
2585 else
2586 {
2587 col = 0;
2588 row = view_start;
2589 }
2590
2591 for (; row < min (end_row, view_end); row++, col = 0)
2592 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2593 srp[col] ^= rstyle;
2594
2595 if (row == end_row)
2596 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2597 srp[col] ^= rstyle;
2598}
2599
2600/* ------------------------------------------------------------------------- */
2601void
2543rxvt_term::scr_reverse_selection () 2602rxvt_term::scr_reverse_selection () NOTHROW
2544{ 2603{
2604 if (selection.op
2545 if (selection.op && current_screen == selection.screen) 2605 && current_screen == selection.screen
2606 && selection.end.row >= view_start)
2546 { 2607 {
2547 int end_row = saveLines - view_start; 2608#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) 2609 if (selection.rect)
2554 { 2610 scr_xor_rect (selection.beg.row, selection.beg.col,
2555 end_row += nrow; 2611 selection.end.row, selection.end.col,
2556 2612 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 2613 else
2562#endif 2614#endif
2563 { 2615 scr_xor_span (selection.beg.row, selection.beg.col,
2564 if (i >= end_row) 2616 selection.end.row, selection.end.col,
2565 col = selection.beg.col; 2617 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 } 2618 }
2583} 2619}
2584 2620
2585/* ------------------------------------------------------------------------- */ 2621/* ------------------------------------------------------------------------- */
2586/* 2622/*
2587 * Dump the whole scrollback and screen to the passed filedescriptor. The 2623 * Dump the whole scrollback and screen to the passed filedescriptor. The
2588 * invoking routine must close the fd. 2624 * invoking routine must close the fd.
2589 */ 2625 */
2590#if 0 2626#if 0
2591void 2627void
2592rxvt_term::scr_dump (int fd) 2628rxvt_term::scr_dump (int fd) NOTHROW
2593{ 2629{
2594 int row, wrote; 2630 int row, wrote;
2595 unsigned int width, towrite; 2631 unsigned int width, towrite;
2596 char r1[] = "\n"; 2632 char r1[] = "\n";
2597 2633
2598 for (row = saveLines - nscrolled; 2634 for (row = saveLines + top_row;
2599 row < saveLines + nrow - 1; row++) 2635 row < saveLines + nrow - 1; row++)
2600 { 2636 {
2601 width = save[row].l >= 0 ? save[row].l 2637 width = row_buf[row].l >= 0 ? row_buf[row].l
2602 : ncol; 2638 : ncol;
2603 for (towrite = width; towrite; towrite -= wrote) 2639 for (towrite = width; towrite; towrite -= wrote)
2604 { 2640 {
2605 wrote = write (fd, & (save[row].t[width - towrite]), 2641 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2606 towrite); 2642 towrite);
2607 if (wrote < 0) 2643 if (wrote < 0)
2608 return; /* XXX: death, no report */ 2644 return; /* XXX: death, no report */
2609 } 2645 }
2610 if (save[row].l >= 0) 2646 if (row_buf[row].l >= 0)
2611 if (write (fd, r1, 1) <= 0) 2647 if (write (fd, r1, 1) <= 0)
2612 return; /* XXX: death, no report */ 2648 return; /* XXX: death, no report */
2613 } 2649 }
2614} 2650}
2615#endif 2651#endif
2616 2652
2617/* ------------------------------------------------------------------------- * 2653/* ------------------------------------------------------------------------- *
2618 * CHARACTER SELECTION * 2654 * CHARACTER SELECTION *
2619 * ------------------------------------------------------------------------- */ 2655 * ------------------------------------------------------------------------- */
2620
2621/*
2622 * -nscrolled <= (selection row) <= nrow - 1
2623 */
2624void 2656void
2625rxvt_term::selection_check (int check_more) 2657rxvt_term::selection_check (int check_more) NOTHROW
2626{ 2658{
2627 row_col_t pos; 2659 row_col_t pos;
2628 2660
2629 if (!selection.op) 2661 if (!selection.op)
2630 return; 2662 return;
2631 2663
2632 pos.row = pos.col = 0; 2664 pos.row = pos.col = 0;
2633 if ((selection.beg.row < - (int32_t)nscrolled) 2665 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2634 || (selection.beg.row >= nrow) 2666 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2635 || (selection.mark.row < - (int32_t)nscrolled) 2667 || !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 2668 || (check_more == 1
2640 && current_screen == selection.screen 2669 && current_screen == selection.screen
2641 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2670 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2642 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2671 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2643 || (check_more == 2 2672 || (check_more == 2
… …
2654/* ------------------------------------------------------------------------- */ 2683/* ------------------------------------------------------------------------- */
2655/* 2684/*
2656 * Paste a selection direct to the command fd 2685 * Paste a selection direct to the command fd
2657 */ 2686 */
2658void 2687void
2659rxvt_term::paste (unsigned char *data, unsigned int len) 2688rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2660{ 2689{
2661 /* convert normal newline chars into common keyboard Return key sequence */ 2690 /* convert normal newline chars into common keyboard Return key sequence */
2662 for (unsigned int i = 0; i < len; i++) 2691 for (unsigned int i = 0; i < len; i++)
2663 if (data[i] == C0_LF) 2692 if (data[i] == C0_LF)
2664 data[i] = C0_CR; 2693 data[i] = C0_CR;
2665 2694
2695 if (priv_modes & PrivMode_BracketPaste)
2696 tt_printf ("\e[200~");
2697
2666 tt_write (data, len); 2698 tt_write (data, len);
2699
2700 if (priv_modes & PrivMode_BracketPaste)
2701 tt_printf ("\e[201~");
2702}
2703
2704void
2705rxvt_term::paste (char *data, unsigned int len) NOTHROW
2706{
2707 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2708 return;
2709
2710 tt_paste (data, len);
2667} 2711}
2668 2712
2669/* ------------------------------------------------------------------------- */ 2713/* ------------------------------------------------------------------------- */
2670/* 2714/*
2671 * Respond to a notification that a primary selection has been sent 2715 * Respond to a notification that a primary selection has been sent
2672 * EXT: SelectionNotify 2716 * EXT: SelectionNotify
2673 */ 2717 */
2674void 2718void
2675rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2719rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2676{ 2720{
2677 if (prop == None) /* check for failed XConvertSelection */ 2721 if (prop == None) /* check for failed XConvertSelection */
2678 { 2722 {
2679 if ((selection_type & Sel_CompoundText)) 2723 if ((selection_type & Sel_CompoundText))
2680 { 2724 {
… …
2700 } 2744 }
2701 2745
2702 unsigned long bytes_after; 2746 unsigned long bytes_after;
2703 XTextProperty ct; 2747 XTextProperty ct;
2704 2748
2705 if (XGetWindowProperty (display->display, win, prop, 2749 if (XGetWindowProperty (dpy, win, prop,
2706 0, PROP_SIZE / 4, 2750 0, PROP_SIZE / 4,
2707 delete_prop, AnyPropertyType, 2751 delete_prop, AnyPropertyType,
2708 &ct.encoding, &ct.format, 2752 &ct.encoding, &ct.format,
2709 &ct.nitems, &bytes_after, 2753 &ct.nitems, &bytes_after,
2710 &ct.value) != Success) 2754 &ct.value) != Success)
… …
2719 if (bytes_after) 2763 if (bytes_after)
2720 { 2764 {
2721 // fetch and append remaining data 2765 // fetch and append remaining data
2722 XTextProperty ct2; 2766 XTextProperty ct2;
2723 2767
2724 if (XGetWindowProperty (display->display, win, prop, 2768 if (XGetWindowProperty (dpy, win, prop,
2725 ct.nitems / 4, (bytes_after + 3) / 4, 2769 ct.nitems / 4, (bytes_after + 3) / 4,
2726 delete_prop, AnyPropertyType, 2770 delete_prop, AnyPropertyType,
2727 &ct2.encoding, &ct2.format, 2771 &ct2.encoding, &ct2.format,
2728 &ct2.nitems, &bytes_after, 2772 &ct2.nitems, &bytes_after,
2729 &ct2.value) != Success) 2773 &ct2.value) != Success)
… …
2742 2786
2743 if (ct.encoding == xa[XA_INCR]) 2787 if (ct.encoding == xa[XA_INCR])
2744 { 2788 {
2745 // INCR selection, start handshake 2789 // INCR selection, start handshake
2746 if (!delete_prop) 2790 if (!delete_prop)
2747 XDeleteProperty (display->display, win, prop); 2791 XDeleteProperty (dpy, win, prop);
2748 2792
2749 selection_wait = Sel_incr; 2793 selection_wait = Sel_incr;
2750 incr_buf_fill = 0; 2794 incr_buf_fill = 0;
2751 incr_ev.start (NOW + 10); 2795 incr_ev.start (10);
2752 2796
2753 goto bailout; 2797 goto bailout;
2754 } 2798 }
2755 2799
2756 if (ct.nitems == 0) 2800 if (ct.nitems == 0)
… …
2765 ct.nitems = incr_buf_fill; 2809 ct.nitems = incr_buf_fill;
2766 incr_buf = 0; 2810 incr_buf = 0;
2767 incr_buf_size = 0; 2811 incr_buf_size = 0;
2768 incr_ev.stop (); 2812 incr_ev.stop ();
2769 } 2813 }
2770 else 2814 else
2771 { 2815 {
2772 if (selection_wait == Sel_normal 2816 if (selection_wait == Sel_normal
2773 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2817 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2774 { 2818 {
2775 /* 2819 /*
… …
2782 goto bailout; 2826 goto bailout;
2783 } 2827 }
2784 } 2828 }
2785 else if (selection_wait == Sel_incr) 2829 else if (selection_wait == Sel_incr)
2786 { 2830 {
2787 incr_ev.start (NOW + 10); 2831 incr_ev.start (10);
2788 2832
2789 while (incr_buf_fill + ct.nitems > incr_buf_size) 2833 while (incr_buf_fill + ct.nitems > incr_buf_size)
2790 { 2834 {
2791 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2835 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2792 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2836 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2799 } 2843 }
2800 2844
2801 char **cl; 2845 char **cl;
2802 int cr; 2846 int cr;
2803 2847
2804#if ENABLE_FRILLS 2848#if !ENABLE_MINIMAL
2805 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2849 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2806 // so recode it manually 2850 // so recode it manually
2807 if (ct.encoding == xa[XA_UTF8_STRING]) 2851 if (ct.encoding == xa[XA_UTF8_STRING])
2808 { 2852 {
2809 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2853 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2810 char *s = rxvt_wcstombs (w); 2854 char *s = rxvt_wcstombs (w);
2811 free (w); 2855 free (w);
2812 // TODO: strlen == only the first element will be converted. well... 2856 // TODO: strlen == only the first element will be converted. well...
2813 paste ((unsigned char *)s, strlen (s)); 2857 paste (s, strlen (s));
2814 free (s); 2858 free (s);
2815 } 2859 }
2816 else 2860 else
2817#endif 2861#endif
2818 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2862 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2819 && cl) 2863 && cl)
2820 { 2864 {
2821 for (int i = 0; i < cr; i++) 2865 for (int i = 0; i < cr; i++)
2822 paste ((unsigned char *)cl[i], strlen (cl[i])); 2866 paste (cl[i], strlen (cl[i]));
2823 2867
2824 XFreeStringList (cl); 2868 XFreeStringList (cl);
2825 } 2869 }
2826 else 2870 else
2827 paste (ct.value, ct.nitems); // paste raw 2871 paste ((char *)ct.value, ct.nitems); // paste raw
2828 2872
2829bailout: 2873bailout:
2830 XFree (ct.value); 2874 XFree (ct.value);
2831 2875
2832 if (selection_wait == Sel_normal) 2876 if (selection_wait == Sel_normal)
2833 selection_wait = Sel_none; 2877 selection_wait = Sel_none;
2834} 2878}
2835 2879
2836void 2880void
2837rxvt_term::incr_cb (time_watcher &w) 2881rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2838{ 2882{
2839 selection_wait = Sel_none; 2883 selection_wait = Sel_none;
2840 2884
2841 incr_buf_size = 0; 2885 incr_buf_size = 0;
2842 free (incr_buf); 2886 free (incr_buf);
2843 2887
2844 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2888 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2845} 2889}
2846 2890
2847void 2891void
2848rxvt_term::selection_property (Window win, Atom prop) 2892rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2849{ 2893{
2850 if (prop == None || selection_wait != Sel_incr) 2894 if (prop == None || selection_wait != Sel_incr)
2851 return; 2895 return;
2852 2896
2853 selection_paste (win, prop, true); 2897 selection_paste (win, prop, true);
2854} 2898}
2855 2899
2856/* ------------------------------------------------------------------------- */ 2900/* ------------------------------------------------------------------------- */
2857/* 2901/*
2858 * Request the current selection: 2902 * Request the current selection:
2859 * Order: > internal selection if available 2903 * Order: > internal selection if available
2860 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2904 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2861 * > CUT_BUFFER0 2905 * > CUT_BUFFER0
2862 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2906 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2863 * will auto fallback to CUT_BUFFER0 2907 * will auto fallback to CUT_BUFFER0
2864 * EXT: button 2 release 2908 * EXT: button 2 release
2865 */ 2909 */
2866void 2910void
2867rxvt_term::selection_request (Time tm, int x, int y) 2911rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2868{ 2912{
2869 if (x < 0 || x >= width || y < 0 || y >= height) 2913 if (selection.text && selnum == Sel_Primary)
2870 return; /* outside window */ 2914 {
2871
2872 if (selection.text)
2873 { /* internal selection */ 2915 /* internal selection */
2874 char *str = rxvt_wcstombs (selection.text, selection.len); 2916 char *str = rxvt_wcstombs (selection.text, selection.len);
2875 paste ((unsigned char *)str, strlen (str)); 2917 paste (str, strlen (str));
2876 free (str); 2918 free (str);
2877 return; 2919 return;
2878 } 2920 }
2879 else 2921 else
2880 { 2922 {
2881 int i;
2882
2883 selection_request_time = tm; 2923 selection_request_time = tm;
2884 selection_wait = Sel_normal; 2924 selection_wait = Sel_normal;
2885 2925
2886 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2887 {
2888#if X_HAVE_UTF8_STRING 2926#if X_HAVE_UTF8_STRING
2889 selection_type = Sel_UTF8String; 2927 selection_type = Sel_UTF8String;
2890 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2928 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2891 return; 2929 return;
2892#else 2930#else
2893 selection_type = Sel_CompoundText; 2931 selection_type = Sel_CompoundText;
2894 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2932 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2895 return; 2933 return;
2896#endif 2934#endif
2897 }
2898 } 2935 }
2899 2936
2900 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2937 selection_wait = Sel_none; /* don't loop in selection_paste () */
2901 selection_paste (display->root, XA_CUT_BUFFER0, false); 2938 selection_paste (display->root, XA_CUT_BUFFER0, false);
2902} 2939}
2903 2940
2904int 2941int
2905rxvt_term::selection_request_other (Atom target, int selnum) 2942rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2906{ 2943{
2907 Atom sel; 2944 Atom sel;
2908 2945
2909 selection_type |= selnum; 2946 selection_type |= selnum;
2910 2947
… …
2913 else if (selnum == Sel_Secondary) 2950 else if (selnum == Sel_Secondary)
2914 sel = XA_SECONDARY; 2951 sel = XA_SECONDARY;
2915 else 2952 else
2916 sel = xa[XA_CLIPBOARD]; 2953 sel = xa[XA_CLIPBOARD];
2917 2954
2918 if (XGetSelectionOwner (display->display, sel) != None) 2955 if (XGetSelectionOwner (dpy, sel) != None)
2919 { 2956 {
2920 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2957 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2921 vt, selection_request_time); 2958 vt, selection_request_time);
2922 return 1; 2959 return 1;
2923 } 2960 }
2924 2961
2925 return 0; 2962 return 0;
… …
2929/* 2966/*
2930 * Clear all selected text 2967 * Clear all selected text
2931 * EXT: SelectionClear 2968 * EXT: SelectionClear
2932 */ 2969 */
2933void 2970void
2934rxvt_term::selection_clear () 2971rxvt_term::selection_clear (bool clipboard) NOTHROW
2935{ 2972{
2973 if (!clipboard)
2974 {
2936 want_refresh = 1; 2975 want_refresh = 1;
2937 free (selection.text); 2976 free (selection.text);
2938 selection.text = NULL; 2977 selection.text = NULL;
2939 selection.len = 0; 2978 selection.len = 0;
2940 CLEAR_SELECTION (); 2979 CLEAR_SELECTION ();
2941 2980
2942 if (display->selection_owner == this) 2981 if (display->selection_owner == this)
2943 display->selection_owner = 0; 2982 display->selection_owner = 0;
2983 }
2984 else
2985 {
2986 free (selection.clip_text);
2987 selection.clip_text = NULL;
2988 selection.clip_len = 0;
2989
2990 if (display->clipboard_owner == this)
2991 display->clipboard_owner = 0;
2992 }
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