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

Diff Legend

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