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

Diff Legend

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