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

Diff Legend

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