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

Diff Legend

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