ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

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

Diff Legend

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