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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines