ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

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

Diff Legend

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