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

Diff Legend

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