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.32 by pcg, Sun Feb 22 10:38:11 2004 UTC vs.
Revision 1.260 by root, Sat Feb 18 15:24:39 2006 UTC

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

Diff Legend

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