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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.66 by pcg, Sun Mar 28 02:07:08 2004 UTC vs.
Revision 1.174 by root, Mon Dec 19 02:40:14 2005 UTC

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

Diff Legend

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