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

Diff Legend

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