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.28 by pcg, Tue Feb 10 00:40:39 2004 UTC vs.
Revision 1.182 by root, Wed Dec 21 10:35:47 2005 UTC

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

Diff Legend

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