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

Diff Legend

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