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

Diff Legend

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