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.26 by pcg, Sun Feb 1 20:12:53 2004 UTC vs.
Revision 1.179 by root, Tue Dec 20 22:47:14 2005 UTC

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

Diff Legend

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