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

Diff Legend

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