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