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.247 by root, Sun Jan 22 20:39:47 2006 UTC

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

Diff Legend

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