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

Diff Legend

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