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

Diff Legend

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