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.315 by root, Tue Nov 4 14:38:29 2008 UTC

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