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

Diff Legend

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