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

Diff Legend

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