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