ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.178 by root, Tue Dec 20 22:27:49 2005 UTC vs.
Revision 1.260 by root, Sat Feb 18 15:24:39 2006 UTC

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

Diff Legend

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