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.36 by pcg, Tue Feb 24 22:28:42 2004 UTC vs.
Revision 1.312 by root, Tue Nov 4 13:30:41 2008 UTC

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

Diff Legend

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