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