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