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.24 by pcg, Sat Jan 31 04:12:10 2004 UTC vs.
Revision 1.175 by root, Tue Dec 20 19:30:59 2005 UTC

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

Diff Legend

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