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

Diff Legend

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