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

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

Diff Legend

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