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

Diff Legend

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