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.253 by root, Fri Jan 27 18:36:43 2006 UTC

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