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

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

Diff Legend

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