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

Diff Legend

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