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.34 by pcg, Tue Feb 24 00:44:23 2004 UTC vs.
Revision 1.242 by root, Thu Jan 19 19:51:08 2006 UTC

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

Diff Legend

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