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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.66 by pcg, Sun Mar 28 02:07:08 2004 UTC vs.
Revision 1.190 by root, Thu Dec 22 15:52:57 2005 UTC

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

Diff Legend

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