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

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

Diff Legend

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