ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

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

Diff Legend

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