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.29 by pcg, Wed Feb 11 08:13:45 2004 UTC vs.
Revision 1.190 by root, Thu Dec 22 15:52:57 2005 UTC

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

Diff Legend

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