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