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