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.43 by pcg, Wed Mar 3 02:59:53 2004 UTC vs.
Revision 1.309 by root, Mon Jul 21 16:51:31 2008 UTC

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

Diff Legend

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