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

Diff Legend

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