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.29 by pcg, Wed Feb 11 08:13:45 2004 UTC vs.
Revision 1.401 by sf-exg, Tue Nov 15 18:20:38 2011 UTC

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

Diff Legend

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