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.31 by pcg, Sun Feb 22 08:09:38 2004 UTC vs.
Revision 1.396 by root, Wed Nov 2 10:53:12 2011 UTC

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

Diff Legend

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