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

Diff Legend

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