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