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.24 by pcg, Sat Jan 31 04:12:10 2004 UTC vs.
Revision 1.252 by root, Wed Jan 25 21:09:21 2006 UTC

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

Diff Legend

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