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

Diff Legend

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