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

Diff Legend

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