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.66 by pcg, Sun Mar 28 02:07:08 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; 519 want_refresh = 1;
520 view_start = 0;
521
522 if (current_screen == scrn)
523 return scrn;
524
525 selection_check (2); /* check for boundary cross */
526
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
550#if NSCREENS 535#if NSCREENS
551 int offset; 536 if (OPTION (Opt_secondaryScreen))
552#endif 537 {
553
554 want_refresh = 1;
555
556 D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn));
557
558 TermWin.view_start = 0;
559
560 if (current_screen == scrn)
561 return current_screen;
562
563 selection_check (2); /* check for boundary cross */
564
565 SWAP_IT (current_screen, scrn, int);
566#if NSCREENS
567 num_scr = 0; 538 num_scr = 0;
568 offset = TermWin.saveLines; 539
569 for (i = prev_nrow; i--;) 540 for (int i = prev_nrow; i--; )
570 { 541 ::swap (ROW(i), swap_buf [i]);
571 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); 542
572 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); 543 ::swap (screen.charset, swap.charset);
573 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *); 544 ::swap (screen.flags, swap.flags);
574 }
575 SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
576 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
577# ifdef DEBUG_STRICT
578 assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow));
579 assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol));
580# else /* drive with your eyes closed */
581 MAX_IT (screen.cur.row, 0);
582 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
583 MAX_IT (screen.cur.col, 0);
584 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
585# endif
586 SWAP_IT (screen.charset, swap.charset, int16_t);
587 SWAP_IT (screen.flags, swap.flags, int);
588 screen.flags |= Screen_VisibleCursor; 545 screen.flags |= Screen_VisibleCursor;
589 swap.flags |= Screen_VisibleCursor; 546 swap.flags |= Screen_VisibleCursor;
590#else 547 }
591# ifdef SCROLL_ON_NO_SECONDARY 548 else
592 if (current_screen == PRIMARY) 549#endif
550 if (OPTION (Opt_secondaryScroll))
593 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); 551 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
594# endif 552
595#endif
596 return scrn; 553 return scrn;
597} 554}
598 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
599/* ------------------------------------------------------------------------- */ 573/* ------------------------------------------------------------------------- */
600/* 574/*
601 * Change the colour for following text 575 * Change the colour for following text
602 */ 576 */
603void 577void
604rxvt_term::scr_color (unsigned int color, int fgbg) 578rxvt_term::scr_color (unsigned int color, int fgbg)
605{ 579{
606 color &= RS_fgMask; 580 if (color > maxTermCOLOR)
581 color = fgbg;
582
607 if (fgbg == Color_fg) 583 if (fgbg == Color_fg)
608 rstyle = SET_FGCOLOR (rstyle, color); 584 rstyle = SET_FGCOLOR (rstyle, color);
609 else 585 else
610 rstyle = SET_BGCOLOR (rstyle, color); 586 rstyle = SET_BGCOLOR (rstyle, color);
611} 587}
… …
628/* ------------------------------------------------------------------------- */ 604/* ------------------------------------------------------------------------- */
629/* 605/*
630 * Scroll text between <row1> and <row2> inclusive, by <count> lines 606 * Scroll text between <row1> and <row2> inclusive, by <count> lines
631 * count positive ==> scroll up 607 * count positive ==> scroll up
632 * count negative ==> scroll down 608 * count negative ==> scroll down
633 * spec == 0 for normal routines
634 */ 609 */
635int 610int
636rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec) 611rxvt_term::scr_scroll_text (int row1, int row2, int count)
637{ 612{
638 int i, j;
639 long nscrolled;
640
641 if (count == 0 || (row1 > row2)) 613 if (count == 0 || (row1 > row2))
642 return 0; 614 return 0;
643 615
644 want_refresh = 1; 616 want_refresh = 1;
645 D_SCREEN ((stderr, "rxvt_scroll_text (%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary")); 617 num_scr += count;
646 618
647 if ((count > 0) && (row1 == 0) && (current_screen == PRIMARY)) 619 if (count > 0
620 && row1 == 0
621 && row2 == nrow - 1
622 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
648 { 623 {
649 nscrolled = (long)TermWin.nscrolled + (long)count; 624 nsaved = min (nsaved + count, saveLines);
650 625
651 if (nscrolled > (long)TermWin.saveLines) 626 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END));
652 TermWin.nscrolled = TermWin.saveLines;
653 else 627
654 TermWin.nscrolled = (uint16_t)nscrolled; 628 term_start = (term_start + count) % total_rows;
655 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
656 if ((Options & Opt_scrollWithBuffer) 657 if (OPTION (Opt_scrollWithBuffer)
657 && TermWin.view_start != 0 658 && view_start != 0
658 && TermWin.view_start != TermWin.saveLines) 659 && view_start != saveLines)
659 scr_page (UP, count); 660 scr_page (UP, count);
660 } 661 }
661 else if (!spec) 662 else
662 row1 += TermWin.saveLines; 663 {
663
664 row2 += TermWin.saveLines;
665
666 if (selection.op && current_screen == selection.screen) 664 if (selection.op && current_screen == selection.screen)
667 { 665 {
668 i = selection.beg.row + TermWin.saveLines; 666 if ((selection.beg.row < row1 && selection.end.row > row1)
669 j = selection.end.row + TermWin.saveLines; 667 || (selection.beg.row < row2 && selection.end.row > row2)
670 if ((i < row1 && j > row1) 668 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
671 || (i < row2 && j > row2) 669 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
672 || (i - count < row1 && i >= row1) 670 || (selection.end.row - count < row1 && selection.end.row >= row1)
673 || (i - count > row2 && i <= row2) 671 || (selection.end.row - count > row2 && selection.end.row <= row2))
674 || (j - count < row1 && j >= row1)
675 || (j - count > row2 && j <= row2))
676 { 672 {
677 CLEAR_ALL_SELECTION (); 673 CLEAR_ALL_SELECTION ();
678 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 674 selection.op = SELECTION_CLEAR;
679 } 675 }
680 else if (j >= row1 && j <= row2) 676 else if (selection.end.row >= row1 && selection.end.row <= row2)
681 { 677 {
682 /* move selected region too */ 678 /* move selected region too */
683 selection.beg.row -= count; 679 selection.beg.row -= count;
684 selection.end.row -= count; 680 selection.end.row -= count;
685 selection.mark.row -= count; 681 selection.mark.row -= count;
682
683 selection_check (0);
686 } 684 }
687 }
688
689 selection_check (0); /* _after_ TermWin.nscrolled update */
690
691 num_scr += count;
692 j = count;
693
694 if (count < 0)
695 count = -count;
696
697 i = row2 - row1 + 1;
698 MIN_IT (count, i);
699
700 if (j > 0)
701 {
702 /* A: scroll up */
703
704 /* A1: Copy lines that will get clobbered by the rotation */
705 for (i = 0, j = row1; i < count; i++, j++)
706 { 685 }
707 buf_text[i] = screen.text[j]; 686
708 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++)
709 } 695 {
710 /* A2: Rotate lines */ 696 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
711 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);
712 { 700 }
713 screen.tlen[j] = screen.tlen[i];
714 screen.text[j] = screen.text[i];
715 screen.rend[j] = screen.rend[i];
716 }
717 j = row2 - count + 1, i = count;
718 }
719 else /* if (j < 0) */
720 {
721 /* B: scroll down */
722 701
723 /* B1: Copy lines that will get clobbered by the rotation */ 702 for (int row = 0; row < rows; row++)
724 for (i = 0, j = row2; i < count; i++, j--) 703 ROW(row1 + row) = temp_buf [row];
725 {
726 buf_text[i] = screen.text[j];
727 buf_rend[i] = screen.rend[j];
728 }
729 /* B2: Rotate lines */
730 for (j = row2, i = j - count; i >= row1; i--, j--)
731 {
732 screen.tlen[j] = screen.tlen[i];
733 screen.text[j] = screen.text[i];
734 screen.rend[j] = screen.rend[i];
735 }
736 j = row1, i = count;
737 count = -count;
738 }
739
740 /* C: Resurrect lines */
741 for (; i--; j++)
742 {
743 screen.tlen[j] = 0;
744 screen.text[j] = buf_text[i];
745 screen.rend[j] = buf_rend[i];
746
747 if (!spec) /* line length may not equal TermWin.ncol */
748 scr_blank_screen_mem (screen.text, screen.rend,
749 (unsigned int)j, rstyle);
750 } 704 }
751 705
752 return count; 706 return count;
753} 707}
754 708
755/* ------------------------------------------------------------------------- */ 709/* ------------------------------------------------------------------------- */
756/* 710/*
757 * Add text given in <str> of length <len> to screen struct 711 * Add text given in <str> of length <len> to screen struct
758 */ 712 */
759void 713void
760rxvt_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)
761{ 715{
762 unsigned char checksel, clearsel;
763 unicode_t c;
764 int i, row, last_col;
765 text_t *stp;
766 rend_t *srp;
767
768 if (len <= 0) /* sanity */ 716 if (len <= 0) /* sanity */
769 return; 717 return;
770 718
719 unsigned char checksel;
720 unicode_t c;
721 int ncol = this->ncol;
722 const wchar_t *strend = str + len;
723
771 want_refresh = 1; 724 want_refresh = 1;
772 last_col = TermWin.ncol;
773
774 D_SCREEN ((stderr, "rxvt_scr_add_lines (%d,%d)", nlines, len));
775 ZERO_SCROLLBACK (); 725 ZERO_SCROLLBACK ();
726
776 if (nlines > 0) 727 if (minlines > 0)
777 { 728 {
778 nlines += (screen.cur.row - screen.bscroll); 729 minlines += screen.cur.row - screen.bscroll;
730
779 if ((nlines > 0) 731 if (minlines > 0
780 && (screen.tscroll == 0) 732 && screen.tscroll == 0
781 && (screen.bscroll == (TermWin.nrow - 1))) 733 && screen.bscroll == nrow - 1)
782 { 734 {
783 /* _at least_ this many lines need to be scrolled */ 735 /* _at least_ this many lines need to be scrolled */
784 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); 736 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
785 screen.cur.row -= nlines; 737 screen.cur.row -= minlines;
786 } 738 }
787 } 739 }
740
788#ifdef DEBUG_STRICT 741#ifdef DEBUG_STRICT
789 assert (screen.cur.col < last_col); 742 assert (screen.cur.col < ncol);
790 assert ((screen.cur.row < TermWin.nrow) 743 assert (screen.cur.row < nrow
791 && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); 744 && screen.cur.row >= -nsaved);
792#else /* drive with your eyes closed */
793 MIN_IT (screen.cur.col, last_col - 1);
794 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
795 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled);
796#endif 745#endif
797 row = screen.cur.row + TermWin.saveLines; 746 int row = screen.cur.row;
798 747
799 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 748 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
800 clearsel = 0;
801 749
802 stp = screen.text[row]; 750 line_t *line = &ROW(row);
803 srp = screen.rend[row];
804 751
805 while (len--) 752 while (str < strend)
806 { 753 {
807 c = *str++; 754 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
808 755
809 if (c < 0x20) 756 if (c < 0x20)
810 switch (c) 757 if (c == C0_LF)
811 { 758 {
812 case '\t': 759 max_it (line->l, screen.cur.col);
813 scr_tab (1);
814 continue;
815 760
816 case '\n':
817 if (screen.tlen[row] != -1) /* XXX: think about this */
818 MAX_IT (screen.tlen[row], screen.cur.col);
819
820 screen.flags &= ~Screen_WrapNext; 761 screen.flags &= ~Screen_WrapNext;
821 762
822 if (screen.cur.row == screen.bscroll) 763 if (screen.cur.row == screen.bscroll)
823 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 764 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
824 else if (screen.cur.row < (TermWin.nrow - 1)) 765 else if (screen.cur.row < (nrow - 1))
825 row = (++screen.cur.row) + TermWin.saveLines; 766 row = ++screen.cur.row;
826 767
827 stp = screen.text[row]; /* _must_ refresh */ 768 line = &ROW(row); /* _must_ refresh */
828 srp = screen.rend[row]; /* _must_ refresh */
829 continue; 769 continue;
770 }
771 else if (c == C0_CR)
772 {
773 max_it (line->l, screen.cur.col);
830 774
831 case '\r':
832 if (screen.tlen[row] != -1) /* XXX: think about this */
833 MAX_IT (screen.tlen[row], screen.cur.col);
834
835 screen.flags &= ~Screen_WrapNext; 775 screen.flags &= ~Screen_WrapNext;
836 screen.cur.col = 0; 776 screen.cur.col = 0;
837 continue; 777 continue;
778 }
779 else if (c == C0_HT)
780 {
781 scr_tab (1, true);
782 continue;
838 } 783 }
839 784
840 if (checksel /* see if we're writing within selection */ 785 if (checksel /* see if we're writing within selection */
841 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 786 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
842 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 787 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
843 { 788 {
844 checksel = 0; 789 checksel = 0;
845 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 ();
846 } 796 }
847 797
848 if (screen.flags & Screen_WrapNext) 798 if (screen.flags & Screen_WrapNext)
849 { 799 {
850 screen.tlen[row] = -1; 800 max_it (line->l, ncol);
851 if (screen.cur.row == screen.bscroll) 801 line->is_longer (1);
852 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
853 else if (screen.cur.row < (TermWin.nrow - 1))
854 row = (++screen.cur.row) + TermWin.saveLines;
855 802
856 stp = screen.text[row]; /* _must_ refresh */ 803 scr_do_wrap ();
857 srp = screen.rend[row]; /* _must_ refresh */ 804
858 screen.cur.col = 0; 805 row = screen.cur.row;
859 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 }
860 } 840 }
861 841
862 if (screen.flags & Screen_Insert) 842 if (screen.flags & Screen_Insert)
863 scr_insdel_chars (1, INSERT); 843 scr_insdel_chars (width, INSERT);
864 844
865 // rely on wcwidth to tell us the character width, at least for non-latin1
866 // do wcwidth before further replacements, as wcwidth says that line-drawing
867 // characters have width -1 (DOH!) on GNU/Linux sometimes.
868 int width = c < 256 ? 1 : wcwidth (c);
869
870 if (charsets[screen.charset] == '0') // DEC SPECIAL
871 {
872 // vt100 special graphics and line drawing
873 static uint16_t vt100_0[32] = { // 5f .. 7e
874 0x0020, 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0,
875 0x00b1, 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c,
876 0x23ba, 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534,
877 0x252c, 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7,
878 };
879
880 if (c >= 0x5f && c <= 0x7e)
881 {
882 c = vt100_0[c - 0x5f];
883 width = 1;
884 }
885 }
886
887 if (width > 0) 845 if (width != 0)
888 { 846 {
889#if !UNICODE_3 && ENABLE_COMBINING 847#if !UNICODE_3
890 // trim characters we can't store directly :( 848 // trim characters we can't store directly :(
891 if (c >= 0x10000) 849 if (c >= 0x10000)
850# if ENABLE_COMBINING
892 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;
893#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
894 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 ();
895 890
896 do 891 do
897 { 892 {
898 stp[screen.cur.col] = c; 893 line->t[screen.cur.col] = c;
899 srp[screen.cur.col] = rend; 894 line->r[screen.cur.col] = rend;
900 895
901 if (screen.cur.col < last_col - 1) 896 if (screen.cur.col < ncol - 1)
902 screen.cur.col++; 897 screen.cur.col++;
903 else 898 else
904 { 899 {
905 screen.tlen[row] = last_col; 900 line->l = ncol;
906 if (screen.flags & Screen_Autowrap) 901 if (screen.flags & Screen_Autowrap)
907 screen.flags |= Screen_WrapNext; 902 screen.flags |= Screen_WrapNext;
908 break; 903 break;
909 } 904 }
910 905
911 c = NOCHAR; 906 c = NOCHAR;
912 } 907 }
913 while (--width > 0); 908 while (--width > 0);
914 909
915 // pad with spaces when overwriting wide character with smaller one 910 // pad with spaces when overwriting wide character with smaller one
916 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++) 911 if (!width)
917 { 912 {
913 line->touch ();
914
915 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
916 {
918 stp[c] = ' '; 917 line->t[c] = ' ';
919 srp[c] = rend; 918 line->r[c] = rend;
919 }
920 } 920 }
921 } 921 }
922 else if (width == 0) 922 else // width == 0
923 { 923 {
924#if ENABLE_COMBINING 924#if ENABLE_COMBINING
925 // handle combining characters 925 // handle combining characters
926 // we just tag the accent on the previous on-screen character. 926 // we just tag the accent on the previous on-screen character.
927 // this is arguably not correct, but also arguably not wrong. 927 // this is arguably not correct, but also arguably not wrong.
928 // we don't handle double-width characters nicely yet. 928 // we don't handle double-width characters nicely yet.
929 929 line_t *linep;
930 text_t *tp; 930 text_t *tp;
931 rend_t *rp; 931 rend_t *rp;
932 932
933 if (screen.cur.col > 0) 933 if (screen.cur.col > 0)
934 { 934 {
935 linep = line;
935 tp = stp + screen.cur.col - 1; 936 tp = line->t + screen.cur.col - 1;
936 rp = srp + screen.cur.col - 1; 937 rp = line->r + screen.cur.col - 1;
937 } 938 }
938 else if (screen.cur.row > 0 939 else if (screen.cur.row > 0
939 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) 940 && ROW(screen.cur.row - 1).is_longer ())
940 { 941 {
941 tp = screen.text[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; 942 linep = &ROW(screen.cur.row - 1);
942 rp = screen.rend[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; 943 tp = line->t + ncol - 1;
944 rp = line->r + ncol - 1;
943 } 945 }
944 else 946 else
945 continue; 947 continue;
946 948
947 // handle double-width-chars by making them look extremely ugly 949 linep->touch ();
948 if (*tp == NOCHAR) 950
949 *tp = ' '; // hack //D //TODO //--tp, --rp; 951 while (*tp == NOCHAR && tp > linep->t)
952 tp--, rp--;
950 953
951 // first try to find a precomposed character 954 // first try to find a precomposed character
952 unicode_t n = rxvt_compose (*tp, c); 955 unicode_t n = rxvt_compose (*tp, c);
953 if (n == NOCHAR) 956 if (n == NOCHAR)
954 n = rxvt_composite.compose (*tp, c); 957 n = rxvt_composite.compose (*tp, c);
955 958
956 *tp = n; 959 *tp = n;
957 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); 960 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
958#endif 961#endif
959 } 962 }
960 } 963 }
961 964
962 if (screen.tlen[row] != -1) /* XXX: think about this */ 965 max_it (line->l, screen.cur.col);
963 MAX_IT (screen.tlen[row], screen.cur.col);
964
965 /*
966 * If we wrote anywhere in the selected area, kill the selection
967 * XXX: should we kill the mark too? Possibly, but maybe that
968 * should be a similar check.
969 */
970 if (clearsel)
971 CLEAR_SELECTION ();
972 966
973#ifdef DEBUG_STRICT 967#ifdef DEBUG_STRICT
974 assert (screen.cur.row >= 0); 968 assert (screen.cur.row >= 0);
975#else /* drive with your eyes closed */
976 MAX_IT (screen.cur.row, 0);
977#endif 969#endif
978} 970}
979 971
980/* ------------------------------------------------------------------------- */ 972/* ------------------------------------------------------------------------- */
981/* 973/*
… …
984 */ 976 */
985void 977void
986rxvt_term::scr_backspace () 978rxvt_term::scr_backspace ()
987{ 979{
988 want_refresh = 1; 980 want_refresh = 1;
981
989 if (screen.cur.col == 0) 982 if (screen.cur.col == 0)
990 { 983 {
991 if (screen.cur.row > 0) 984 if (screen.cur.row > 0)
992 { 985 {
993#ifdef TERMCAP_HAS_BW 986#ifdef TERMCAP_HAS_BW
994 screen.cur.col = TermWin.ncol - 1; 987 screen.cur.col = ncol - 1;
995 screen.cur.row--; 988 screen.cur.row--;
996 return; 989 return;
997#endif 990#endif
998
999 } 991 }
1000 } 992 }
1001 else if ((screen.flags & Screen_WrapNext) == 0) 993 else if (!(screen.flags & Screen_WrapNext))
1002 scr_gotorc (0, -1, RELATIVE); 994 scr_gotorc (0, -1, RELATIVE);
995
1003 screen.flags &= ~Screen_WrapNext; 996 screen.flags &= ~Screen_WrapNext;
1004} 997}
1005 998
1006/* ------------------------------------------------------------------------- */ 999/* ------------------------------------------------------------------------- */
1007/* 1000/*
1008 * Process Horizontal Tab 1001 * Process Horizontal Tab
1009 * count: +ve = forward; -ve = backwards 1002 * count: +ve = forward; -ve = backwards
1010 * XTERM_SEQ: CTRL-I 1003 * XTERM_SEQ: CTRL-I
1011 */ 1004 */
1012void 1005void
1013rxvt_term::scr_tab (int count) 1006rxvt_term::scr_tab (int count, bool ht)
1014{ 1007{
1015 int i, x; 1008 int i, x;
1016 1009
1017 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count));
1018 want_refresh = 1; 1010 want_refresh = 1;
1019 i = x = screen.cur.col; 1011 i = x = screen.cur.col;
1020 1012
1021 if (count == 0) 1013 if (count == 0)
1022 return; 1014 return;
1023 else if (count > 0) 1015 else if (count > 0)
1024 { 1016 {
1017 line_t &l = ROW(screen.cur.row);
1018 rend_t base_rend = l.r[i];
1019 ht &= l.t[i] == ' ';
1020
1025 for (; ++i < TermWin.ncol; ) 1021 for (; ++i < ncol; )
1026 if (tabs[i]) 1022 if (tabs[i])
1027 { 1023 {
1028 x = i; 1024 x = i;
1025
1029 if (!--count) 1026 if (!--count)
1030 break; 1027 break;
1031 } 1028 }
1029 else
1030 ht &= l.t[i] == ' '
1031 && RS_SAME (l.r[i], base_rend);
1032 1032
1033 if (count) 1033 if (count)
1034 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 }
1035 } 1055 }
1036 else /* if (count < 0) */ 1056 else /* if (count < 0) */
1037 { 1057 {
1038 for (; --i >= 0; ) 1058 for (; --i >= 0; )
1039 if (tabs[i]) 1059 if (tabs[i])
… …
1056 * Process DEC Back Index 1076 * Process DEC Back Index
1057 * XTERM_SEQ: ESC 6 1077 * XTERM_SEQ: ESC 6
1058 * 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
1059 * in that row right. Clear left column. 1079 * in that row right. Clear left column.
1060 */ 1080 */
1061#ifndef NO_FRILLS 1081#if ENABLE_FRILLS
1062void 1082void
1063rxvt_term::scr_backindex () 1083rxvt_term::scr_backindex ()
1064{ 1084{
1065 if (screen.cur.col > 0) 1085 if (screen.cur.col > 0)
1066 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1086 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1067 else 1087 else
1068 {
1069 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
1070 return; /* um, yeah? */
1071 scr_insdel_chars (1, INSERT); 1088 scr_insdel_chars (1, INSERT);
1072 }
1073} 1089}
1074#endif 1090#endif
1075/* ------------------------------------------------------------------------- */ 1091/* ------------------------------------------------------------------------- */
1076/* 1092/*
1077 * Process DEC Forward Index 1093 * Process DEC Forward Index
1078 * XTERM_SEQ: ESC 9 1094 * XTERM_SEQ: ESC 9
1079 * 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
1080 * in that row left. Clear right column. 1096 * in that row left. Clear right column.
1081 */ 1097 */
1082#ifndef NO_FRILLS 1098#if ENABLE_FRILLS
1083void 1099void
1084rxvt_term::scr_forwardindex () 1100rxvt_term::scr_forwardindex ()
1085{ 1101{
1086 int row;
1087
1088 if (screen.cur.col < TermWin.ncol - 1) 1102 if (screen.cur.col < ncol - 1)
1089 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1103 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1090 else 1104 else
1091 { 1105 {
1092 row = screen.cur.row + TermWin.saveLines; 1106 line_t &l = ROW(screen.cur.row);
1093 if (screen.tlen[row] == 0) 1107
1094 return; /* um, yeah? */ 1108 l.touch ();
1095 else if (screen.tlen[row] == -1) 1109 l.is_longer (0);
1096 screen.tlen[row] = TermWin.ncol; 1110
1097 scr_gotorc (0, 0, R_RELATIVE); 1111 scr_gotorc (0, 0, R_RELATIVE);
1098 scr_insdel_chars (1, DELETE); 1112 scr_insdel_chars (1, DELETE);
1099 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); 1113 scr_gotorc (0, ncol - 1, R_RELATIVE);
1100 } 1114 }
1101} 1115}
1102#endif 1116#endif
1103 1117
1104/* ------------------------------------------------------------------------- */ 1118/* ------------------------------------------------------------------------- */
… …
1109rxvt_term::scr_gotorc (int row, int col, int relative) 1123rxvt_term::scr_gotorc (int row, int col, int relative)
1110{ 1124{
1111 want_refresh = 1; 1125 want_refresh = 1;
1112 ZERO_SCROLLBACK (); 1126 ZERO_SCROLLBACK ();
1113 1127
1114 D_SCREEN ((stderr, "rxvt_scr_gotorc (r:%s%d,c:%s%d): from (r:%d,c:%d)", (relative & R_RELATIVE ? "+" : ""), row, (relative & C_RELATIVE ? "+" : ""), col, screen.cur.row, screen.cur.col));
1115
1116 screen.cur.col = ((relative & C_RELATIVE) ? (screen.cur.col + col) 1128 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1117 : col); 1129 clamp_it (screen.cur.col, 0, ncol - 1);
1118 MAX_IT (screen.cur.col, 0);
1119 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1120 1130
1121 screen.flags &= ~Screen_WrapNext; 1131 screen.flags &= ~Screen_WrapNext;
1132
1122 if (relative & R_RELATIVE) 1133 if (relative & R_RELATIVE)
1123 { 1134 {
1124 if (row > 0) 1135 if (row > 0)
1125 { 1136 {
1126 if (screen.cur.row <= screen.bscroll 1137 if (screen.cur.row <= screen.bscroll
… …
1141 else 1152 else
1142 { 1153 {
1143 if (screen.flags & Screen_Relative) 1154 if (screen.flags & Screen_Relative)
1144 { /* relative origin mode */ 1155 { /* relative origin mode */
1145 screen.cur.row = row + screen.tscroll; 1156 screen.cur.row = row + screen.tscroll;
1146 MIN_IT (screen.cur.row, screen.bscroll); 1157 min_it (screen.cur.row, screen.bscroll);
1147 } 1158 }
1148 else 1159 else
1149 screen.cur.row = row; 1160 screen.cur.row = row;
1150 } 1161 }
1151 MAX_IT (screen.cur.row, 0);
1152 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1153 1162
1154 while (screen.cur.col > 0 1163 clamp_it (screen.cur.row, 0, nrow - 1);
1155 && screen.text[screen.cur.row + TermWin.saveLines][screen.cur.col] == NOCHAR)
1156 screen.cur.col--;
1157} 1164}
1158 1165
1159/* ------------------------------------------------------------------------- */ 1166/* ------------------------------------------------------------------------- */
1160/* 1167/*
1161 * direction should be UP or DN 1168 * direction should be UP or DN
1162 */ 1169 */
1163void 1170void
1164rxvt_term::scr_index (enum page_dirn direction) 1171rxvt_term::scr_index (enum page_dirn direction)
1165{ 1172{
1166 int dirn; 1173 int dirn;
1167 1174
1168 want_refresh = 1; 1175 want_refresh = 1;
1176 ZERO_SCROLLBACK ();
1177
1169 dirn = ((direction == UP) ? 1 : -1); 1178 dirn = ((direction == UP) ? 1 : -1);
1170 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn));
1171
1172 ZERO_SCROLLBACK ();
1173 1179
1174 screen.flags &= ~Screen_WrapNext; 1180 screen.flags &= ~Screen_WrapNext;
1181
1175 if ((screen.cur.row == screen.bscroll && direction == UP) 1182 if ((screen.cur.row == screen.bscroll && direction == UP)
1176 || (screen.cur.row == screen.tscroll && direction == DN)) 1183 || (screen.cur.row == screen.tscroll && direction == DN))
1177 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1184 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1178 else 1185 else
1179 screen.cur.row += dirn; 1186 screen.cur.row += dirn;
1180 MAX_IT (screen.cur.row, 0); 1187
1181 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1188 clamp_it (screen.cur.row, 0, nrow - 1);
1182 selection_check (0); 1189 selection_check (0);
1183} 1190}
1184 1191
1185/* ------------------------------------------------------------------------- */ 1192/* ------------------------------------------------------------------------- */
1186/* 1193/*
… …
1190 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1197 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1191 */ 1198 */
1192void 1199void
1193rxvt_term::scr_erase_line (int mode) 1200rxvt_term::scr_erase_line (int mode)
1194{ 1201{
1195 unsigned int row, col, num; 1202 unsigned int col, num;
1196 1203
1197 want_refresh = 1; 1204 want_refresh = 1;
1198 D_SCREEN ((stderr, "rxvt_scr_erase_line (%d) at screen row: %d", mode, screen.cur.row));
1199 ZERO_SCROLLBACK (); 1205 ZERO_SCROLLBACK ();
1200 1206
1201 selection_check (1); 1207 selection_check (1);
1202 1208
1203 screen.flags &= ~Screen_WrapNext; 1209 line_t &line = ROW(screen.cur.row);
1204 1210
1205 row = TermWin.saveLines + screen.cur.row; 1211 line.touch ();
1212 line.is_longer (0);
1213
1206 switch (mode) 1214 switch (mode)
1207 { 1215 {
1208 case 0: /* erase to end of line */ 1216 case 0: /* erase to end of line */
1209 col = screen.cur.col; 1217 col = screen.cur.col;
1210 num = TermWin.ncol - col; 1218 num = ncol - col;
1211 MIN_IT (screen.tlen[row], (int16_t)col); 1219 min_it (line.l, col);
1212 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1220 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1213 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1221 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1214 CLEAR_SELECTION (); 1222 CLEAR_SELECTION ();
1215 break; 1223 break;
1216 case 1: /* erase to beginning of line */ 1224 case 1: /* erase to beginning of line */
… …
1220 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1228 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1221 CLEAR_SELECTION (); 1229 CLEAR_SELECTION ();
1222 break; 1230 break;
1223 case 2: /* erase whole line */ 1231 case 2: /* erase whole line */
1224 col = 0; 1232 col = 0;
1225 num = TermWin.ncol; 1233 num = ncol;
1226 screen.tlen[row] = 0; 1234 line.l = 0;
1227 if (selection.beg.row <= screen.cur.row 1235 if (selection.beg.row <= screen.cur.row
1228 && selection.end.row >= screen.cur.row) 1236 && selection.end.row >= screen.cur.row)
1229 CLEAR_SELECTION (); 1237 CLEAR_SELECTION ();
1230 break; 1238 break;
1231 default: 1239 default:
1232 return; 1240 return;
1233 } 1241 }
1234 1242
1235 if (screen.text[row]) 1243 scr_blank_line (line, col, num, rstyle);
1236 scr_blank_line (& (screen.text[row][col]),
1237 & (screen.rend[row][col]), num, rstyle);
1238 else
1239 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle);
1240} 1244}
1241 1245
1242/* ------------------------------------------------------------------------- */ 1246/* ------------------------------------------------------------------------- */
1243/* 1247/*
1244 * Erase part of whole of the screen 1248 * Erase part of whole of the screen
… …
1248 */ 1252 */
1249void 1253void
1250rxvt_term::scr_erase_screen (int mode) 1254rxvt_term::scr_erase_screen (int mode)
1251{ 1255{
1252 int num; 1256 int num;
1253 int32_t row, row_offset; 1257 int32_t row;
1254 rend_t ren; 1258 rend_t ren;
1255 XGCValues gcvalue; 1259 XGCValues gcvalue;
1256 1260
1257 want_refresh = 1; 1261 want_refresh = 1;
1258 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row));
1259 ZERO_SCROLLBACK (); 1262 ZERO_SCROLLBACK ();
1260 row_offset = (int32_t)TermWin.saveLines;
1261 1263
1262 switch (mode) 1264 switch (mode)
1263 { 1265 {
1264 case 0: /* erase to end of screen */ 1266 case 0: /* erase to end of screen */
1265 selection_check (1); 1267 selection_check (1);
1266 scr_erase_line (0); 1268 scr_erase_line (0);
1267 row = screen.cur.row + 1; /* possible OOB */ 1269 row = screen.cur.row + 1; /* possible OOB */
1268 num = TermWin.nrow - row; 1270 num = nrow - row;
1269 break; 1271 break;
1270 case 1: /* erase to beginning of screen */ 1272 case 1: /* erase to beginning of screen */
1271 selection_check (3); 1273 selection_check (3);
1272 scr_erase_line (1); 1274 scr_erase_line (1);
1273 row = 0; 1275 row = 0;
1274 num = screen.cur.row; 1276 num = screen.cur.row;
1275 break; 1277 break;
1276 case 2: /* erase whole screen */ 1278 case 2: /* erase whole screen */
1277 selection_check (3); 1279 selection_check (3);
1278 row = 0; 1280 row = 0;
1279 num = TermWin.nrow; 1281 num = nrow;
1280 break; 1282 break;
1281 default: 1283 default:
1282 return; 1284 return;
1283 } 1285 }
1284
1285 refresh_type |= REFRESH_BOUNDS;
1286 1286
1287 if (selection.op && current_screen == selection.screen 1287 if (selection.op && current_screen == selection.screen
1288 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1288 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1289 || (selection.end.row >= row 1289 || (selection.end.row >= row
1290 && selection.end.row <= row + num))) 1290 && selection.end.row <= row + num)))
1291 CLEAR_SELECTION (); 1291 CLEAR_SELECTION ();
1292 1292
1293 if (row >= TermWin.nrow) /* Out Of Bounds */ 1293 if (row >= nrow) /* Out Of Bounds */
1294 return; 1294 return;
1295 1295
1296 MIN_IT (num, (TermWin.nrow - row)); 1296 min_it (num, nrow - row);
1297 1297
1298 if (rstyle & (RS_RVid | RS_Uline)) 1298 if (rstyle & (RS_RVid | RS_Uline))
1299 ren = (rend_t) ~RS_None; 1299 ren = (rend_t) ~RS_None;
1300 else if (GET_BASEBG (rstyle) == Color_bg) 1300 else if (GET_BASEBG (rstyle) == Color_bg)
1301 { 1301 {
1302 ren = DEFAULT_RSTYLE; 1302 ren = DEFAULT_RSTYLE;
1303 CLEAR_ROWS (row, num); 1303 CLEAR_ROWS (row, num);
1304 } 1304 }
1305 else 1305 else
1306 { 1306 {
1307 ren = (rstyle & (RS_fgMask | RS_bgMask)); 1307 ren = rstyle & (RS_fgMask | RS_bgMask);
1308 gcvalue.foreground = PixColors[GET_BGCOLOR (rstyle)]; 1308 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1309 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1309 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1310 ERASE_ROWS (row, num); 1310 ERASE_ROWS (row, num);
1311 gcvalue.foreground = PixColors[Color_fg]; 1311 gcvalue.foreground = pix_colors[Color_fg];
1312 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1312 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1313 } 1313 }
1314 1314
1315 for (; num--; row++) 1315 for (; num--; row++)
1316 { 1316 {
1317 scr_blank_screen_mem (screen.text, screen.rend, 1317 scr_blank_screen_mem (ROW(row), rstyle);
1318 (unsigned int) (row + row_offset), rstyle); 1318 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1319 screen.tlen[row + row_offset] = 0;
1320 scr_blank_line (drawn_text[row], drawn_rend[row],
1321 (unsigned int)TermWin.ncol, ren);
1322 } 1319 }
1323} 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
1324 1332
1325/* ------------------------------------------------------------------------- */ 1333/* ------------------------------------------------------------------------- */
1326/* 1334/*
1327 * Fill the screen with `E's 1335 * Fill the screen with `E's
1328 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1336 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1329 */ 1337 */
1330void 1338void
1331rxvt_term::scr_E () 1339rxvt_term::scr_E ()
1332{ 1340{
1333 int i, j, k; 1341 rend_t fs;
1334 rend_t *r1, fs;
1335 1342
1336 want_refresh = 1; 1343 want_refresh = 1;
1344 ZERO_SCROLLBACK ();
1345
1337 num_scr_allow = 0; 1346 num_scr_allow = 0;
1338 ZERO_SCROLLBACK ();
1339 selection_check (3); 1347 selection_check (3);
1340 1348
1341 fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E')); 1349 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1342 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1350 for (int row = nrow; row--; )
1343 { 1351 {
1344 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ 1352 line_t &line = ROW(row);
1353
1345 fill_text (screen.text[k], 'E', TermWin.ncol); 1354 fill_text (line.t, 'E', ncol);
1346 for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) 1355 rend_t *r1 = line.r;
1356
1357 for (int j = ncol; j--; )
1347 *r1++ = fs; 1358 *r1++ = fs;
1359
1360 line.is_longer (0);
1361 line.touch (ncol);
1348 } 1362 }
1349} 1363}
1350 1364
1351/* ------------------------------------------------------------------------- */ 1365/* ------------------------------------------------------------------------- */
1352/* 1366/*
… …
1370 if (insdel == DELETE) 1384 if (insdel == DELETE)
1371 return; 1385 return;
1372 else if (insdel == INSERT) 1386 else if (insdel == INSERT)
1373 count = end; 1387 count = end;
1374 } 1388 }
1375 screen.flags &= ~Screen_WrapNext;
1376 1389
1390 scr_do_wrap ();
1391
1377 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1392 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count);
1378} 1393}
1379 1394
1380/* ------------------------------------------------------------------------- */ 1395/* ------------------------------------------------------------------------- */
1381/* 1396/*
1382 * Insert/Delete <count> characters from the current position 1397 * Insert/Delete <count> characters from the current position
… …
1384void 1399void
1385rxvt_term::scr_insdel_chars (int count, int insdel) 1400rxvt_term::scr_insdel_chars (int count, int insdel)
1386{ 1401{
1387 int col, row; 1402 int col, row;
1388 rend_t tr; 1403 rend_t tr;
1389 text_t *stp;
1390 rend_t *srp;
1391 int16_t *slp;
1392 1404
1393 want_refresh = 1; 1405 want_refresh = 1;
1394 ZERO_SCROLLBACK (); 1406 ZERO_SCROLLBACK ();
1395 1407
1396 if (count <= 0) 1408 if (count <= 0)
1397 return; 1409 return;
1398 1410
1411 scr_do_wrap ();
1412
1399 selection_check (1); 1413 selection_check (1);
1400 MIN_IT (count, (TermWin.ncol - screen.cur.col)); 1414 min_it (count, ncol - screen.cur.col);
1401 1415
1402 row = screen.cur.row + TermWin.saveLines;
1403 screen.flags &= ~Screen_WrapNext;
1404
1405 stp = screen.text[row];
1406 srp = screen.rend[row]; 1416 row = screen.cur.row;
1407 slp = & (screen.tlen[row]); 1417
1418 line_t *line = &ROW(row);
1419
1420 line->touch ();
1421 line->is_longer (0);
1408 1422
1409 switch (insdel) 1423 switch (insdel)
1410 { 1424 {
1411 case INSERT: 1425 case INSERT:
1412 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1426 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1413 col--)
1414 { 1427 {
1415 stp[col] = stp[col - count]; 1428 line->t[col] = line->t[col - count];
1416 srp[col] = srp[col - count]; 1429 line->r[col] = line->r[col - count];
1417 } 1430 }
1418 1431
1419 if (*slp != -1) 1432 line->l = min (line->l + count, ncol);
1420 {
1421 *slp += count;
1422 MIN_IT (*slp, TermWin.ncol);
1423 }
1424 1433
1425 if (selection.op && current_screen == selection.screen 1434 if (selection.op && current_screen == selection.screen
1426 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1435 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1427 { 1436 {
1428 if (selection.end.row != screen.cur.row 1437 if (selection.end.row != screen.cur.row
1429 || (selection.end.col + count >= TermWin.ncol)) 1438 || (selection.end.col + count >= ncol))
1430 CLEAR_SELECTION (); 1439 CLEAR_SELECTION ();
1431 else 1440 else
1432 { /* shift selection */ 1441 { /* shift selection */
1433 selection.beg.col += count; 1442 selection.beg.col += count;
1434 selection.mark.col += count; /* XXX: yes? */ 1443 selection.mark.col += count; /* XXX: yes? */
1435 selection.end.col += count; 1444 selection.end.col += count;
1436 } 1445 }
1437 } 1446 }
1438 1447
1439 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1448 scr_blank_line (*line, screen.cur.col, count, rstyle);
1440 (unsigned int)count, rstyle);
1441 break; 1449 break;
1442 1450
1443 case ERASE: 1451 case ERASE:
1444 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1452 screen.cur.col += count; /* don't worry if > ncol */
1445 selection_check (1); 1453 selection_check (1);
1446 screen.cur.col -= count; 1454 screen.cur.col -= count;
1447 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1455
1448 (unsigned int)count, rstyle); 1456 line->l = max (line->l - count, 0);
1457 scr_blank_line (*line, screen.cur.col, count, rstyle);
1449 break; 1458 break;
1450 1459
1451 case DELETE: 1460 case DELETE:
1452 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1461 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1453 1462
1454 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) 1463 for (col = screen.cur.col; (col + count) < ncol; col++)
1455 { 1464 {
1456 stp[col] = stp[col + count]; 1465 line->t[col] = line->t[col + count];
1457 srp[col] = srp[col + count]; 1466 line->r[col] = line->r[col + count];
1458 } 1467 }
1459 1468
1460 scr_blank_line (& (stp[TermWin.ncol - count]), 1469 line->l = max (line->l - count, 0);
1461 & (srp[TermWin.ncol - count]), 1470 scr_blank_line (*line, ncol - count, count, tr);
1462 (unsigned int)count, tr);
1463
1464 if (*slp == -1) /* break line continuation */
1465 *slp = TermWin.ncol;
1466
1467 *slp -= count;
1468 MAX_IT (*slp, 0);
1469 1471
1470 if (selection.op && current_screen == selection.screen 1472 if (selection.op && current_screen == selection.screen
1471 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1473 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1472 { 1474 {
1473 if (selection.end.row != screen.cur.row 1475 if (selection.end.row != screen.cur.row
1474 || (screen.cur.col >= selection.beg.col - count) 1476 || (screen.cur.col >= selection.beg.col - count)
1475 || selection.end.col >= TermWin.ncol) 1477 || selection.end.col >= ncol)
1476 CLEAR_SELECTION (); 1478 CLEAR_SELECTION ();
1477 else 1479 else
1478 { 1480 {
1479 /* shift selection */ 1481 /* shift selection */
1480 selection.beg.col -= count; 1482 selection.beg.col -= count;
1481 selection.mark.col -= count; /* XXX: yes? */ 1483 selection.mark.col -= count; /* XXX: yes? */
1482 selection.end.col -= count; 1484 selection.end.col -= count;
1483 } 1485 }
1484 } 1486 }
1485 1487
1486 break; 1488 break;
1487 } 1489 }
… …
1493 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1495 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1494 */ 1496 */
1495void 1497void
1496rxvt_term::scr_scroll_region (int top, int bot) 1498rxvt_term::scr_scroll_region (int top, int bot)
1497{ 1499{
1498 MAX_IT (top, 0); 1500 max_it (top, 0);
1499 MIN_IT (bot, (int)TermWin.nrow - 1); 1501 min_it (bot, nrow - 1);
1500 1502
1501 if (top > bot) 1503 if (top > bot)
1502 return; 1504 return;
1503 1505
1504 screen.tscroll = top; 1506 screen.tscroll = top;
… …
1514 */ 1516 */
1515void 1517void
1516rxvt_term::scr_cursor_visible (int mode) 1518rxvt_term::scr_cursor_visible (int mode)
1517{ 1519{
1518 want_refresh = 1; 1520 want_refresh = 1;
1521
1519 if (mode) 1522 if (mode)
1520 screen.flags |= Screen_VisibleCursor; 1523 screen.flags |= Screen_VisibleCursor;
1521 else 1524 else
1522 screen.flags &= ~Screen_VisibleCursor; 1525 screen.flags &= ~Screen_VisibleCursor;
1523} 1526}
… …
1532rxvt_term::scr_autowrap (int mode) 1535rxvt_term::scr_autowrap (int mode)
1533{ 1536{
1534 if (mode) 1537 if (mode)
1535 screen.flags |= Screen_Autowrap; 1538 screen.flags |= Screen_Autowrap;
1536 else 1539 else
1537 screen.flags &= ~ (Screen_Autowrap | Screen_WrapNext); 1540 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
1538} 1541}
1539 1542
1540/* ------------------------------------------------------------------------- */ 1543/* ------------------------------------------------------------------------- */
1541/* 1544/*
1542 * Set/unset margin origin mode 1545 * Set/unset margin origin mode
… …
1552{ 1555{
1553 if (mode) 1556 if (mode)
1554 screen.flags |= Screen_Relative; 1557 screen.flags |= Screen_Relative;
1555 else 1558 else
1556 screen.flags &= ~Screen_Relative; 1559 screen.flags &= ~Screen_Relative;
1560
1557 scr_gotorc (0, 0, 0); 1561 scr_gotorc (0, 0, 0);
1558} 1562}
1559 1563
1560/* ------------------------------------------------------------------------- */ 1564/* ------------------------------------------------------------------------- */
1561/* 1565/*
… …
1581 */ 1585 */
1582void 1586void
1583rxvt_term::scr_set_tab (int mode) 1587rxvt_term::scr_set_tab (int mode)
1584{ 1588{
1585 if (mode < 0) 1589 if (mode < 0)
1586 MEMSET (tabs, 0, TermWin.ncol * sizeof (char)); 1590 memset (tabs, 0, ncol * sizeof (char));
1587 else if (screen.cur.col < TermWin.ncol) 1591 else if (screen.cur.col < ncol)
1588 tabs[screen.cur.col] = (mode ? 1 : 0); 1592 tabs [screen.cur.col] = !!mode;
1589} 1593}
1590 1594
1591/* ------------------------------------------------------------------------- */ 1595/* ------------------------------------------------------------------------- */
1592/* 1596/*
1593 * Set reverse/normal video 1597 * Set reverse/normal video
… …
1595 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1599 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1596 */ 1600 */
1597void 1601void
1598rxvt_term::scr_rvideo_mode (int mode) 1602rxvt_term::scr_rvideo_mode (int mode)
1599{ 1603{
1600 XGCValues gcvalue; 1604 XGCValues gcvalue;
1601 1605
1602 if (rvideo != mode) 1606 if (rvideo != mode)
1603 { 1607 {
1604 rvideo = mode; 1608 rvideo = mode;
1605 SWAP_IT (PixColors[Color_fg], PixColors[Color_bg], rxvt_color); 1609 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1606#if defined(XPM_BACKGROUND) 1610#if XPM_BACKGROUND
1607 if (bgPixmap.pixmap == None) 1611 if (bgPixmap.pixmap == None)
1608#endif 1612#endif
1609#if defined(TRANSPARENT) 1613#if TRANSPARENT
1610 if (! (Options & Opt_transparent) || am_transparent == 0) 1614 if (! OPTION (Opt_transparent) || am_transparent == 0)
1611#endif 1615#endif
1612 XSetWindowBackground (display->display, TermWin.vt, 1616 XSetWindowBackground (display->display, vt,
1613 PixColors[Color_bg]); 1617 pix_colors[Color_bg]);
1614 1618
1615 gcvalue.foreground = PixColors[Color_fg]; 1619 gcvalue.foreground = pix_colors[Color_fg];
1616 gcvalue.background = PixColors[Color_bg]; 1620 gcvalue.background = pix_colors[Color_bg];
1617 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, 1621 XChangeGC (display->display, gc, GCBackground | GCForeground,
1618 &gcvalue); 1622 &gcvalue);
1619 scr_clear (); 1623 scr_clear ();
1620 scr_touch (true); 1624 scr_touch (true);
1621 } 1625 }
1622} 1626}
… …
1640 * Set font style 1644 * Set font style
1641 */ 1645 */
1642void 1646void
1643rxvt_term::set_font_style () 1647rxvt_term::set_font_style ()
1644{ 1648{
1649#if 0
1645 switch (charsets[screen.charset]) 1650 switch (charsets [screen.charset])
1646 { 1651 {
1647 case '0': /* DEC Special Character & Line Drawing Set */ 1652 case '0': /* DEC Special Character & Line Drawing Set */
1648 break; 1653 break;
1649 case 'A': /* United Kingdom (UK) */ 1654 case 'A': /* United Kingdom (UK) */
1650 break; 1655 break;
… …
1657 case 'C': /* Finnish character set */ 1662 case 'C': /* Finnish character set */
1658 break; 1663 break;
1659 case 'K': /* German character set */ 1664 case 'K': /* German character set */
1660 break; 1665 break;
1661 } 1666 }
1667#endif
1662} 1668}
1663 1669
1664/* ------------------------------------------------------------------------- */ 1670/* ------------------------------------------------------------------------- */
1665/* 1671/*
1666 * Choose a font 1672 * Choose a font
… …
1669 * XTERM_SEQ: Invoke G2 character set: ESC N 1675 * XTERM_SEQ: Invoke G2 character set: ESC N
1670 * XTERM_SEQ: Invoke G3 character set: ESC O 1676 * XTERM_SEQ: Invoke G3 character set: ESC O
1671 */ 1677 */
1672void 1678void
1673rxvt_term::scr_charset_choose (int set) 1679rxvt_term::scr_charset_choose (int set)
1674 { 1680{
1675 screen.charset = set; 1681 screen.charset = set;
1676 set_font_style (); 1682 set_font_style ();
1677 } 1683}
1678 1684
1679/* ------------------------------------------------------------------------- */ 1685/* ------------------------------------------------------------------------- */
1680/* 1686/*
1681 * Set a font 1687 * Set a font
1682 * XTERM_SEQ: Set G0 character set: ESC ( <C> 1688 * XTERM_SEQ: Set G0 character set: ESC ( <C>
… …
1685 * XTERM_SEQ: Set G3 character set: ESC + <C> 1691 * XTERM_SEQ: Set G3 character set: ESC + <C>
1686 * See set_font_style for possible values for <C> 1692 * See set_font_style for possible values for <C>
1687 */ 1693 */
1688void 1694void
1689rxvt_term::scr_charset_set (int set, unsigned int ch) 1695rxvt_term::scr_charset_set (int set, unsigned int ch)
1690 { 1696{
1691 charsets[set] = (unsigned char)ch; 1697 charsets[set] = (unsigned char)ch;
1692 set_font_style (); 1698 set_font_style ();
1693 } 1699}
1694 1700
1695 1701
1696/* ------------------------------------------------------------------------- * 1702/* ------------------------------------------------------------------------- *
1697 * MAJOR SCREEN MANIPULATION * 1703 * MAJOR SCREEN MANIPULATION *
1698 * ------------------------------------------------------------------------- */ 1704 * ------------------------------------------------------------------------- */
… …
1703bool 1709bool
1704rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1710rxvt_term::scr_refresh_rend (rend_t mask, rend_t value)
1705{ 1711{
1706 bool found = false; 1712 bool found = false;
1707 1713
1708 for (int i = 0; i < TermWin.nrow; i++) 1714 for (int i = 0; i < nrow; i++)
1709 { 1715 {
1710 int col = 0; 1716 int col = 0;
1711 rend_t *drp = drawn_rend [i]; 1717 rend_t *drp = drawn_buf[i].r;
1712 1718
1713 for (; col < TermWin.ncol; col++, drp++) 1719 for (; col < ncol; col++, drp++)
1714 if ((*drp & mask) == value) 1720 if ((*drp & mask) == value)
1715 { 1721 {
1716 found = true; 1722 found = true;
1717 *drp = ~value; 1723 *drp = ~value;
1718 } 1724 }
… …
1729 PART_END, 1735 PART_END,
1730 RC_COUNT 1736 RC_COUNT
1731}; 1737};
1732 1738
1733void 1739void
1734rxvt_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)
1735{ 1741{
1736 int i; 1742 int i;
1737 row_col_t rc[RC_COUNT]; 1743 row_col_t rc[RC_COUNT];
1738 1744
1739 if (drawn_text == NULL) /* sanity check */ 1745 if (!drawn_buf) /* sanity check */
1740 return; 1746 return;
1741 1747
1742#ifdef DEBUG_STRICT 1748#ifndef NO_SLOW_LINK_SUPPORT
1743 x = max (x, (int)TermWin.int_bwidth); 1749 if (refresh_type == FAST_REFRESH && !display->is_local)
1744 x = min (x, (int)TermWin.width); 1750 {
1745 y = max (y, (int)TermWin.int_bwidth); 1751 y = 0;
1746 y = min (y, (int)TermWin.height); 1752 eheight = height;
1753 }
1747#endif 1754#endif
1748 1755
1749 /* round down */ 1756 /* round down */
1750 rc[PART_BEG].col = Pixel2Col (x); 1757 rc[PART_BEG].col = Pixel2Col (x);
1751 rc[PART_BEG].row = Pixel2Row (y); 1758 rc[PART_BEG].row = Pixel2Row (y);
1752 /* round up */ 1759 /* round up */
1753 rc[PART_END].col = Pixel2Width (x + width + TermWin.fwidth - 1); 1760 rc[PART_END].col = Pixel2Width (x + ewidth + fwidth - 1);
1754 rc[PART_END].row = Pixel2Row (y + height + TermWin.fheight - 1); 1761 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1755 1762
1756 /* sanity checks */ 1763 /* sanity checks */
1757 for (i = PART_BEG; i < RC_COUNT; i++) 1764 for (i = PART_BEG; i < RC_COUNT; i++)
1758 { 1765 {
1759 MIN_IT (rc[i].col, TermWin.ncol - 1); 1766 min_it (rc[i].col, ncol - 1);
1760 MIN_IT (rc[i].row, TermWin.nrow - 1); 1767 min_it (rc[i].row, nrow - 1);
1761 } 1768 }
1762
1763 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));
1764 1769
1765 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++)
1766 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);
1767 (rc[PART_END].col - rc[PART_BEG].col + 1));
1768 1772
1769 if (refresh) 1773 if (refresh)
1770 scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); 1774 scr_refresh (SLOW_REFRESH);
1771} 1775}
1772 1776
1773/* ------------------------------------------------------------------------- */ 1777/* ------------------------------------------------------------------------- */
1774/* 1778/*
1775 * Refresh the entire screen 1779 * Refresh the entire screen
1776 */ 1780 */
1777void 1781void
1778rxvt_term::scr_touch (bool refresh) 1782rxvt_term::scr_touch (bool refresh)
1779{ 1783{
1780 scr_expose (0, 0, TermWin.width, TermWin.height, refresh); 1784 scr_expose (0, 0, width, height, refresh);
1781} 1785}
1782 1786
1783/* ------------------------------------------------------------------------- */ 1787/* ------------------------------------------------------------------------- */
1784/* 1788/*
1785 * 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
… …
1787 */ 1791 */
1788int 1792int
1789rxvt_term::scr_move_to (int y, int len) 1793rxvt_term::scr_move_to (int y, int len)
1790{ 1794{
1791 long p = 0; 1795 long p = 0;
1792 uint16_t oldviewstart; 1796 unsigned int oldviewstart;
1793 1797
1794 oldviewstart = TermWin.view_start; 1798 oldviewstart = view_start;
1799
1795 if (y < len) 1800 if (y < len)
1796 { 1801 {
1797 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; 1802 p = (nrow + nsaved) * (len - y) / len;
1798 p -= (long) (TermWin.nrow - 1); 1803 p -= (long) (nrow - 1);
1799 p = max (p, 0); 1804 p = max (p, 0);
1800 } 1805 }
1801 TermWin.view_start = (uint16_t)min (p, TermWin.nscrolled); 1806
1802 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);
1803 1808
1804 return scr_changeview (oldviewstart); 1809 return scr_changeview (oldviewstart);
1805} 1810}
1806 1811
1807/* ------------------------------------------------------------------------- */ 1812/* ------------------------------------------------------------------------- */
… …
1810 * direction should be UP or DN 1815 * direction should be UP or DN
1811 */ 1816 */
1812int 1817int
1813rxvt_term::scr_page (enum page_dirn direction, int nlines) 1818rxvt_term::scr_page (enum page_dirn direction, int nlines)
1814{ 1819{
1815 int n; 1820 int n;
1816 uint16_t oldviewstart; 1821 unsigned int oldviewstart;
1817 1822
1818 D_SCREEN ((stderr, "rxvt_scr_page (%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start));
1819#ifdef DEBUG_STRICT
1820 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1821#endif
1822 oldviewstart = TermWin.view_start; 1823 oldviewstart = view_start;
1824
1823 if (direction == UP) 1825 if (direction == UP)
1824 { 1826 {
1825 n = TermWin.view_start + nlines; 1827 n = view_start + nlines;
1826 TermWin.view_start = min (n, TermWin.nscrolled); 1828 view_start = min (n, nsaved);
1827 } 1829 }
1828 else 1830 else
1829 { 1831 {
1830 n = TermWin.view_start - nlines; 1832 n = view_start - nlines;
1831 TermWin.view_start = max (n, 0); 1833 view_start = max (n, 0);
1832 } 1834 }
1835
1833 return scr_changeview (oldviewstart); 1836 return scr_changeview (oldviewstart);
1834} 1837}
1835 1838
1836int 1839int
1837rxvt_term::scr_changeview (uint16_t oldviewstart) 1840rxvt_term::scr_changeview (unsigned int oldviewstart)
1838{ 1841{
1839 if (TermWin.view_start != oldviewstart) 1842 if (view_start != oldviewstart)
1840 { 1843 {
1844 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1845
1841 want_refresh = 1; 1846 want_refresh = 1;
1842 num_scr -= (TermWin.view_start - oldviewstart); 1847 num_scr -= (view_start - oldviewstart);
1843 } 1848 }
1849
1844 return (int) (TermWin.view_start - oldviewstart); 1850 return (int)view_start - (int)oldviewstart;
1845} 1851}
1846 1852
1847/* ------------------------------------------------------------------------- */ 1853/* ------------------------------------------------------------------------- */
1848void 1854void
1849rxvt_term::scr_bell () 1855rxvt_term::scr_bell ()
1850{ 1856{
1851#ifndef NO_BELL 1857#ifndef NO_BELL
1858
1852# ifndef NO_MAPALERT 1859# ifndef NO_MAPALERT
1853# ifdef MAPALERT_OPTION 1860# ifdef MAPALERT_OPTION
1854 if (Options & Opt_mapAlert) 1861 if (OPTION (Opt_mapAlert))
1855# endif 1862# endif
1856 XMapWindow (display->display, TermWin.parent[0]); 1863 XMapWindow (display->display, parent[0]);
1857# endif 1864# endif
1858 if (Options & Opt_visualBell) 1865
1866 if (OPTION (Opt_visualBell))
1859 { 1867 {
1860 scr_rvideo_mode (!rvideo); /* refresh also done */ 1868 scr_rvideo_mode (!rvideo); /* refresh also done */
1869 rxvt_usleep (VISUAL_BELL_DURATION);
1861 scr_rvideo_mode (!rvideo); /* refresh also done */ 1870 scr_rvideo_mode (!rvideo); /* refresh also done */
1862 } 1871 }
1863 else 1872 else
1864 XBell (display->display, 0); 1873 XBell (display->display, 0);
1874
1865#endif 1875#endif
1866} 1876}
1867 1877
1868/* ------------------------------------------------------------------------- */ 1878/* ------------------------------------------------------------------------- */
1869/* ARGSUSED */ 1879/* ARGSUSED */
1870void 1880void
1871rxvt_term::scr_printscreen (int fullhist) 1881rxvt_term::scr_printscreen (int fullhist)
1872{ 1882{
1873#ifdef PRINTPIPE 1883#ifdef PRINTPIPE
1874 int i, r1, nrows, row_offset; 1884 int nrows, row_start;
1875 text_t *t; 1885 FILE *fd;
1876 FILE *fd;
1877 1886
1878 if ((fd = popen_printer ()) == NULL) 1887 if ((fd = popen_printer ()) == NULL)
1879 return; 1888 return;
1880 nrows = TermWin.nrow; 1889
1881 row_offset = TermWin.saveLines;
1882 if (!fullhist) 1890 if (fullhist)
1883 row_offset -= TermWin.view_start; 1891 {
1892 nrows = nrow + nsaved;
1893 row_start = -nsaved;
1894 }
1884 else 1895 else
1885 { 1896 {
1886 nrows += TermWin.nscrolled; 1897 nrows = nrow;
1887 row_offset -= TermWin.nscrolled; 1898 row_start = -view_start;
1888 } 1899 }
1889 1900
1901 wctomb (0, 0);
1902
1890 for (r1 = 0; r1 < nrows; r1++) 1903 for (int r1 = 0; r1 < nrows; r1++)
1891 {
1892 t = screen.text[r1 + row_offset];
1893 for (i = TermWin.ncol - 1; i >= 0; i--)
1894 if (!isspace (t[i]))
1895 break;
1896 fprintf (fd, "%.*s\n", (i + 1), t);
1897 } 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
1898 pclose_printer (fd); 1929 pclose_printer (fd);
1899#endif 1930#endif
1900} 1931}
1901 1932
1902/* ------------------------------------------------------------------------- */ 1933/* ------------------------------------------------------------------------- */
1903/* 1934/*
1904 * Refresh the screen 1935 * Refresh the screen
1905 * drawn_text/drawn_rend contain the screen information before the update. 1936 * drawn_text/drawn_rend contain the screen information before the update.
1906 * screen.text/screen.rend contain what the screen will change to. 1937 * screen.text/screen.rend contain what the screen will change to.
1907 */ 1938 */
1908
1909#define FONT_WIDTH(X, Y) \
1910 (X)->per_char[ (Y) - (X)->min_char_or_byte2].width
1911#define FONT_RBEAR(X, Y) \
1912 (X)->per_char[ (Y) - (X)->min_char_or_byte2].rbearing
1913#define FONT_LBEAR(X, Y) \
1914 (X)->per_char[ (Y) - (X)->min_char_or_byte2].lbearing
1915#define IS_FONT_CHAR(X, Y) \
1916 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
1917
1918void 1939void
1919rxvt_term::scr_refresh (unsigned char refresh_type) 1940rxvt_term::scr_refresh (unsigned char refresh_type)
1920{ 1941{
1921 unsigned char clearfirst, /* first character writes before cell */
1922 clearlast, /* last character writes beyond cell */
1923 must_clear, /* use draw_string not draw_image_string */ 1942 unsigned char must_clear, /* use draw_string not draw_image_string */
1924 rvid, /* reverse video this position */
1925 showcursor; /* show the cursor */ 1943 showcursor; /* show the cursor */
1926 int16_t col, row, /* column/row we're processing */ 1944 int16_t col, row, /* column/row we're processing */
1927 ocrow; /* old cursor row */ 1945 ocrow; /* old cursor row */
1928 int i, /* tmp */ 1946 int i; /* tmp */
1929 row_offset; /* basic offset in screen structure */
1930#ifndef NO_CURSORCOLOR 1947#ifndef NO_CURSORCOLOR
1931 rend_t cc1; /* store colours at cursor position (s) */ 1948 rend_t cc1; /* store colours at cursor position (s) */
1932#endif 1949#endif
1933 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ 1950 rend_t *crp; // cursor rendition pointer
1934 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
1935 1951
1952 want_refresh = 0; /* screen is current */
1953
1936 if (refresh_type == NO_REFRESH || !TermWin.mapped) 1954 if (refresh_type == NO_REFRESH || !mapped)
1937 return; 1955 return;
1938 1956
1939 /* 1957 /*
1940 * A: set up vars 1958 * A: set up vars
1941 */ 1959 */
1942 clearfirst = clearlast = must_clear = 0; 1960 must_clear = 0;
1943
1944 refresh_count = 0; 1961 refresh_count = 0;
1945 1962
1946 row_offset = TermWin.saveLines - TermWin.view_start;
1947
1948 if ((refresh_type & REFRESH_BOUNDS))
1949 {
1950 clearfirst = clearlast = 1;
1951 refresh_type &= ~REFRESH_BOUNDS;
1952 }
1953
1954#ifdef XPM_BACKGROUND 1963#if XPM_BACKGROUND
1955 must_clear |= (bgPixmap.pixmap != None); 1964 must_clear |= bgPixmap.pixmap != None;
1956#endif 1965#endif
1957#ifdef TRANSPARENT 1966#if TRANSPARENT
1958 must_clear |= ((Options & Opt_transparent) && am_transparent); 1967 must_clear |= OPTION (Opt_transparent) && am_transparent;
1959#endif 1968#endif
1960 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1969 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1961 1970
1962 /* 1971 /*
1963 * B: reverse any characters which are selected 1972 * B: reverse any characters which are selected
… …
1978 showcursor = 0; 1987 showcursor = 0;
1979#endif 1988#endif
1980 1989
1981 if (showcursor) 1990 if (showcursor)
1982 { 1991 {
1983 srp = &(screen.rend[screen.cur.row + TermWin.saveLines][screen.cur.col]); 1992 int col = screen.cur.col;
1984 1993
1994 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
1995 col--;
1996
1997 crp = &ROW(screen.cur.row).r[col];
1998
1985 if (showcursor && TermWin.focus) 1999 if (showcursor && focus)
1986 { 2000 {
2001 if (OPTION (Opt_cursorUnderline))
2002 *crp ^= RS_Uline;
2003 else
2004 {
1987 *srp ^= RS_RVid; 2005 *crp ^= RS_RVid;
2006
1988#ifndef NO_CURSORCOLOR 2007#ifndef NO_CURSORCOLOR
1989 cc1 = *srp & (RS_fgMask | RS_bgMask); 2008 cc1 = *crp & (RS_fgMask | RS_bgMask);
1990 if (ISSET_PIXCOLOR (Color_cursor)) 2009 if (ISSET_PIXCOLOR (Color_cursor))
1991 ccol1 = Color_cursor; 2010 ccol1 = Color_cursor;
1992 else 2011 else
1993#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2012#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1994 ccol1 = GET_FGCOLOR (rstyle); 2013 ccol1 = fgcolor_of (rstyle);
1995#else 2014#else
1996 ccol1 = Color_fg; 2015 ccol1 = Color_fg;
1997#endif 2016#endif
1998 if (ISSET_PIXCOLOR (Color_cursor2)) 2017 if (ISSET_PIXCOLOR (Color_cursor2))
1999 ccol2 = Color_cursor2; 2018 ccol2 = Color_cursor2;
2000 else 2019 else
2001#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2020#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2002 ccol2 = GET_BGCOLOR (rstyle); 2021 ccol2 = bgcolor_of (rstyle);
2003#else 2022#else
2004 ccol2 = Color_bg; 2023 ccol2 = Color_bg;
2005#endif 2024#endif
2006 *srp = SET_FGCOLOR (*srp, ccol1); 2025 *crp = SET_FGCOLOR (*crp, ccol1);
2007 *srp = SET_BGCOLOR (*srp, ccol2); 2026 *crp = SET_BGCOLOR (*crp, ccol2);
2008#endif 2027#endif
2028 }
2009 } 2029 }
2010 } 2030 }
2011 2031
2012 /* make sure no outline cursor is left around */ 2032 /* make sure no outline cursor is left around */
2013 setoldcursor = 0; 2033 setoldcursor = 0;
2014 if (ocrow != -1) 2034 if (ocrow != -1)
2015 { 2035 {
2016 if (screen.cur.row + TermWin.view_start != ocrow 2036 if (screen.cur.row + view_start != ocrow
2017 || screen.cur.col != oldcursor.col) 2037 || screen.cur.col != oldcursor.col)
2018 { 2038 {
2019 if (ocrow < TermWin.nrow 2039 if (ocrow < nrow
2020 && oldcursor.col < TermWin.ncol) 2040 && oldcursor.col < ncol)
2021 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); 2041 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2022 2042
2023 if (TermWin.focus || !showcursor) 2043 if (focus || !showcursor)
2024 oldcursor.row = -1; 2044 oldcursor.row = -1;
2025 else 2045 else
2026 setoldcursor = 1; 2046 setoldcursor = 1;
2027 } 2047 }
2028 } 2048 }
2029 else if (!TermWin.focus) 2049 else if (!focus)
2030 setoldcursor = 1; 2050 setoldcursor = 1;
2031 2051
2032 if (setoldcursor) 2052 if (setoldcursor)
2033 { 2053 {
2034 if (screen.cur.row + TermWin.view_start >= TermWin.nrow) 2054 if (screen.cur.row + view_start >= nrow)
2035 oldcursor.row = -1; 2055 oldcursor.row = -1;
2036 else 2056 else
2037 { 2057 {
2038 oldcursor.row = screen.cur.row + TermWin.view_start; 2058 oldcursor.row = screen.cur.row + view_start;
2039 oldcursor.col = screen.cur.col; 2059 oldcursor.col = screen.cur.col;
2040 } 2060 }
2041 } 2061 }
2042 } 2062 }
2063
2064 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2065#if ENABLE_OVERLAY
2066 scr_swap_overlay ();
2067#endif
2043 2068
2044#ifndef NO_SLOW_LINK_SUPPORT 2069#ifndef NO_SLOW_LINK_SUPPORT
2045 /* 2070 /*
2046 * D: CopyArea pass - very useful for slower links 2071 * D: CopyArea pass - very useful for slower links
2047 * This has been deliberately kept simple. 2072 * This has been deliberately kept simple.
2048 */ 2073 */
2049 i = num_scr; 2074 i = num_scr;
2075 if (!display->is_local
2050 if (refresh_type == FAST_REFRESH && num_scr_allow && i 2076 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2051 && abs (i) < TermWin.nrow && !must_clear) 2077 && abs (num_scr) < nrow && !must_clear)
2052 { 2078 {
2053 int16_t nits; 2079 int16_t nits;
2054 int j; 2080 int j;
2055 rend_t *drp2;
2056 text_t *dtp2;
2057 int len, wlen; 2081 int len, wlen;
2058 2082
2059 j = TermWin.nrow; 2083 j = nrow;
2060 wlen = len = -1; 2084 wlen = len = -1;
2061 row = i > 0 ? 0 : j - 1; 2085 row = i > 0 ? 0 : j - 1;
2062 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2086 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2063 { 2087 {
2064 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2088 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2065 { 2089 {
2066 stp = screen.text[row + row_offset]; 2090 line_t s = ROW(row - view_start);
2067 srp = screen.rend[row + row_offset];
2068 dtp = drawn_text[row]; 2091 line_t d = drawn_buf[row];
2069 dtp2 = drawn_text[row + i]; 2092 line_t d2 = drawn_buf[row + i];
2070 drp = drawn_rend[row];
2071 drp2 = drawn_rend[row + i];
2072 2093
2073 for (nits = 0, col = TermWin.ncol; col--; ) 2094 for (nits = 0, col = ncol; col--; )
2074 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2095 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2075 nits--; 2096 nits--;
2076 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])
2077 nits++; 2098 nits++;
2078 2099
2079 if (nits > 8) /* XXX: arbitrary choice */ 2100 if (nits > 8) /* XXX: arbitrary choice */
2080 { 2101 {
2081 for (col = TermWin.ncol; col--; ) 2102 for (col = ncol; col--; )
2082 { 2103 {
2083 *dtp++ = *dtp2++; 2104 *d.t++ = *d2.t++;
2084 *drp++ = *drp2++; 2105 *d.r++ = *d2.r++;
2085 } 2106 }
2086 2107
2087 if (len == -1) 2108 if (len == -1)
2088 len = row; 2109 len = row;
2089 2110
… …
2094 2115
2095 if (len != -1) 2116 if (len != -1)
2096 { 2117 {
2097 /* also comes here at end if needed because of >= above */ 2118 /* also comes here at end if needed because of >= above */
2098 if (wlen < len) 2119 if (wlen < len)
2099 SWAP_IT (wlen, len, int); 2120 ::swap (wlen, len);
2100 2121
2101 D_SCREEN ((stderr, "rxvt_scr_refresh (): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1));
2102 XCopyArea (display->display, TermWin.vt, TermWin.vt, 2122 XCopyArea (display->display, vt, vt,
2103 TermWin.gc, 0, Row2Pixel (len + i), 2123 gc, 0, Row2Pixel (len + i),
2104 (unsigned int)TermWin_TotalWidth (), 2124 (unsigned int)this->width,
2105 (unsigned int)Height2Pixel (wlen - len + 1), 2125 (unsigned int)Height2Pixel (wlen - len + 1),
2106 0, Row2Pixel (len)); 2126 0, Row2Pixel (len));
2107 len = -1; 2127 len = -1;
2108 } 2128 }
2109 } 2129 }
… …
2111#endif 2131#endif
2112 2132
2113 /* 2133 /*
2114 * E: main pass across every character 2134 * E: main pass across every character
2115 */ 2135 */
2116 for (row = 0; row < TermWin.nrow; row++) 2136 for (row = 0; row < nrow; row++)
2117 { 2137 {
2118 stp = screen.text[row + row_offset]; 2138 text_t *stp = ROW(row - view_start).t;
2119 srp = screen.rend[row + row_offset]; 2139 rend_t *srp = ROW(row - view_start).r;
2120 dtp = drawn_text[row]; 2140 text_t *dtp = drawn_buf[row].t;
2121 drp = drawn_rend[row]; 2141 rend_t *drp = drawn_buf[row].r;
2122 2142
2123 /* 2143 /*
2124 * E2: OK, now the real pass 2144 * E2: OK, now the real pass
2125 */ 2145 */
2126 int ypixel = (int)Row2Pixel (row); 2146 int ypixel = (int)Row2Pixel (row);
2127 2147
2128 for (col = 0; col < TermWin.ncol; col++) 2148 for (col = 0; col < ncol; col++)
2129 { 2149 {
2130 /* compare new text with old - if exactly the same then continue */ 2150 /* compare new text with old - if exactly the same then continue */
2131 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2151 if (stp[col] == dtp[col] /* Must match characters to skip. */
2132 && (srp[col] == drp[col] /* Either rendition the same or */ 2152 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2133 || (stp[col] == ' ' /* space w/ no background change */ 2153 || (stp[col] == ' ' /* space w/ no background change */
2134 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col])))) 2154 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2135 continue; 2155 continue;
2136 2156
2137 // redraw one or more characters 2157 // redraw one or more characters
2138 2158
2139 // seek to the beginning if wide characters 2159 // seek to the beginning of wide characters
2140 while (stp[col] == NOCHAR && col > 0) 2160 while (stp[col] == NOCHAR && col > 0)
2141 --col; 2161 --col;
2142 2162
2143 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2163 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2144 text_t *text = stp + col; 2164 text_t *text = stp + col;
… …
2147 dtp[col] = stp[col]; 2167 dtp[col] = stp[col];
2148 drp[col] = rend; 2168 drp[col] = rend;
2149 2169
2150 int xpixel = Col2Pixel (col); 2170 int xpixel = Col2Pixel (col);
2151 2171
2152 // this loop looks very messy, it can probably be optimized
2153 // and cleaned a bit by you?
2154 for (i = 0; ++col < TermWin.ncol; ) 2172 for (i = 0; ++col < ncol; )
2155 { 2173 {
2156 if (stp[col] == NOCHAR) 2174 if (stp[col] == NOCHAR)
2157 { 2175 {
2158 dtp[col] = stp[col]; 2176 dtp[col] = stp[col];
2159 drp[col] = rend; 2177 drp[col] = rend;
2160 count++; 2178 count++;
2161
2162 if (i) // only possible skip if char unchanged
2163 i++; 2179 i++;
2164 2180
2165 continue; 2181 continue;
2166 } 2182 }
2167 2183
2168 if (rend != srp[col]) 2184 if (!RS_SAME (rend, srp[col]))
2169 break; 2185 break;
2170 2186
2171 count++; 2187 count++;
2172 2188
2173 if (stp[col] != dtp[col] 2189 if (stp[col] != dtp[col]
2174 || srp[col] != drp[col]) 2190 || !RS_SAME (srp[col], drp[col]))
2175 { 2191 {
2176 if (must_clear && (i++ > (count / 2))) 2192 if (must_clear && (i++ > count / 2))
2177 break; 2193 break;
2178 2194
2179 dtp[col] = stp[col]; 2195 dtp[col] = stp[col];
2180 drp[col] = rend; 2196 drp[col] = rend;
2181 i = 0; 2197 i = 0;
2182 } 2198 }
2183 else if (must_clear || (stp[col] != ' ' && ++i >= 32)) 2199 else if (must_clear || (stp[col] != ' ' && ++i >= 16))
2184 break; 2200 break;
2185 } 2201 }
2186 2202
2187 col--; /* went one too far. move back */ 2203 col--; /* went one too far. move back */
2188 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--;
2189 2209
2190 /* 2210 /*
2191 * Determine the attributes for the string 2211 * Determine the attributes for the string
2192 */ 2212 */
2193 int fid = GET_FONT (rend);
2194 int fore = GET_FGCOLOR (rend); // desired foreground 2213 int fore = fgcolor_of (rend); // desired foreground
2195 int back = GET_BGCOLOR (rend); // desired background 2214 int back = bgcolor_of (rend); // desired background
2196 2215
2197 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];
2198 2223
2199 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;
2200 2232
2201#ifndef NO_BOLD_UNDERLINE_REVERSE 2233#ifndef NO_BOLD_UNDERLINE_REVERSE
2202 if (rend & RS_Bold && fore == Color_fg) 2234 if (rend & RS_Bold
2235 && fore == Color_fg)
2203 { 2236 {
2204 if (ISSET_PIXCOLOR (Color_BD)) 2237 if (ISSET_PIXCOLOR (Color_BD))
2205 fore = Color_BD; 2238 fore = Color_BD;
2239# if !ENABLE_STYLES
2206 else 2240 else
2207 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
2208 } 2288 }
2209
2210 if (rend & RS_Uline)
2211 if (ISSET_PIXCOLOR (Color_UL))
2212 fore = Color_UL;
2213#endif
2214
2215 if (rvid)
2216 {
2217 SWAP_IT (fore, back, int);
2218
2219#ifndef NO_BOLD_UNDERLINE_REVERSE
2220 if (ISSET_PIXCOLOR (Color_RV)
2221# ifndef NO_CURSORCOLOR
2222 && !ISSET_PIXCOLOR (Color_cursor)
2223# endif
2224 )
2225 back = Color_RV;
2226#endif
2227 }
2228
2229#ifdef TEXT_BLINK
2230 if (rend & RS_Blink && back == Color_bg)
2231 {
2232 if (!text_blink_ev.active)
2233 {
2234 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2235 hidden_text = 0;
2236 }
2237 else if (hidden_text)
2238 fore = back;
2239 }
2240#endif
2241 2289
2242 /* 2290 /*
2243 * Actually do the drawing of the string here 2291 * Actually do the drawing of the string here
2244 */ 2292 */
2245 rxvt_font *font = (*TermWin.fontset)[fid]; 2293 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2246 2294
2247 if (back == fore) 2295 if (back == fore)
2248 font->clear_rect (*TermWin.drawable, xpixel, ypixel, 2296 font->clear_rect (*drawable, xpixel, ypixel,
2249 TermWin.fwidth * count, TermWin.fheight, 2297 fwidth * count, fheight,
2250 back); 2298 back);
2251 else if (back == Color_bg) 2299 else if (back == Color_bg)
2252 { 2300 {
2253 if (must_clear) 2301 if (must_clear)
2254 { 2302 {
2255 CLEAR_CHARS (xpixel, ypixel, count); 2303 CLEAR_CHARS (xpixel, ypixel, count);
2256 2304
2257 for (i = 0; i < count; i++) /* don't draw empty strings */ 2305 for (i = 0; i < count; i++) /* don't draw empty strings */
2258 if (text[i] != ' ') 2306 if (text[i] != ' ')
2259 { 2307 {
2260 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1); 2308 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1);
2261 break; 2309 break;
2262 } 2310 }
2263 } 2311 }
2264 else 2312 else
2265 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); 2313 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg);
2266 } 2314 }
2267 else 2315 else
2268 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2316 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2269 2317
2270 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
2271 XDrawLine (display->display, drawBuffer, TermWin.gc, 2327 XDrawLine (display->display, drawBuffer, gc,
2272 xpixel, ypixel + font->ascent + 1, 2328 xpixel, ypixel + font->ascent + 1,
2273 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2329 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2330 }
2274 } /* for (col....) */ 2331 } /* for (col....) */
2275 } /* 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));
2276 2338
2277 /* 2339 /*
2278 * G: cleanup cursor and display outline cursor if necessary 2340 * G: cleanup cursor and display outline cursor if necessary
2279 */ 2341 */
2280 if (showcursor) 2342 if (showcursor)
2281 { 2343 {
2282 if (TermWin.focus) 2344 if (focus)
2345 {
2346 if (OPTION (Opt_cursorUnderline))
2347 *crp ^= RS_Uline;
2348 else
2283 { 2349 {
2284 srp = & (screen.rend[screen.cur.row + TermWin.saveLines]
2285 [screen.cur.col]);
2286 *srp ^= RS_RVid; 2350 *crp ^= RS_RVid;
2287#ifndef NO_CURSORCOLOR 2351#ifndef NO_CURSORCOLOR
2288 *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2352 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2289#endif 2353#endif
2354 }
2290 } 2355 }
2291 else if (oldcursor.row >= 0) 2356 else if (oldcursor.row >= 0)
2292 { 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
2293#ifndef NO_CURSORCOLOR 2368#ifndef NO_CURSORCOLOR
2294 if (ISSET_PIXCOLOR (Color_cursor)) 2369 if (ISSET_PIXCOLOR (Color_cursor))
2295 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]); 2370 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
2296#endif 2371#endif
2297 int cursorwidth = 1;
2298 while (oldcursor.col + cursorwidth < TermWin.ncol
2299 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2300 cursorwidth++;
2301 2372
2302 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2373 XDrawRectangle (display->display, drawBuffer, gc,
2303 Col2Pixel (oldcursor.col), 2374 Col2Pixel (col),
2304 Row2Pixel (oldcursor.row), 2375 Row2Pixel (oldcursor.row),
2305 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2376 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2306 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2377 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2307 } 2378 }
2308 } 2379 }
2309 2380
2310 /* 2381 /*
2311 * H: cleanup selection 2382 * H: cleanup selection
2312 */ 2383 */
2313 scr_reverse_selection (); 2384 scr_reverse_selection ();
2314 2385
2315 /*
2316 * I: other general cleanup
2317 */
2318 if (clearfirst && TermWin.int_bwidth)
2319 /*
2320 * clear the whole screen height, note that width == 0 is treated
2321 * specially by XClearArea
2322 */
2323 XClearArea (display->display, TermWin.vt, 0, 0,
2324 (unsigned int)TermWin.int_bwidth,
2325 (unsigned int)TermWin_TotalHeight (), False);
2326
2327 if (clearlast && TermWin.int_bwidth)
2328 /*
2329 * clear the whole screen height, note that width == 0 is treated
2330 * specially by XClearArea
2331 */
2332 XClearArea (display->display, TermWin.vt,
2333 TermWin.width + TermWin.int_bwidth, 0,
2334 (unsigned int)TermWin.int_bwidth,
2335 (unsigned int)TermWin_TotalHeight (), False);
2336
2337 if (refresh_type & SMOOTH_REFRESH) 2386 if (refresh_type & SMOOTH_REFRESH)
2338 XSync (display->display, False); 2387 XFlush (display->display);
2339 2388
2340 num_scr = 0; 2389 num_scr = 0;
2341 num_scr_allow = 1; 2390 num_scr_allow = 1;
2342 want_refresh = 0; /* screen is current */
2343} 2391}
2344 2392
2345void 2393void
2346rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) 2394rxvt_term::scr_remap_chars (line_t &l)
2347{ 2395{
2348 if (!rp || !tp) 2396 if (!l.t)
2349 return; 2397 return;
2350 2398
2351 for (int i = TermWin.ncol; i; i--, rp++, tp++) 2399 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2352 *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]));
2353} 2403}
2354 2404
2355void 2405void
2356rxvt_term::scr_remap_chars () 2406rxvt_term::scr_remap_chars ()
2357{ 2407{
2358 for (int i = TermWin.nrow + TermWin.saveLines; i--; ) 2408 for (int i = total_rows; i--; )
2359 scr_remap_chars (screen.text[i], screen.rend[i]); 2409 scr_remap_chars (row_buf [i]);
2360 2410
2361 for (int i = TermWin.nrow; i--; ) 2411 for (int i = nrow; i--; )
2362 {
2363 scr_remap_chars (drawn_text[i], drawn_rend[i]);
2364 scr_remap_chars (swap.text[i], swap.rend[i]);
2365 } 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;
2366} 2446}
2367 2447
2368/* ------------------------------------------------------------------------- */ 2448/* ------------------------------------------------------------------------- */
2369void 2449void
2370rxvt_term::scr_clear (bool really) 2450rxvt_term::scr_clear (bool really)
2371{ 2451{
2372 if (!TermWin.mapped) 2452 if (!mapped)
2373 return; 2453 return;
2374 2454
2375 num_scr_allow = 0; 2455 num_scr_allow = 0;
2376 want_refresh = 1; 2456 want_refresh = 1;
2377 2457
2378#ifdef TRANSPARENT 2458 if (really)
2379 if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) 2459 XClearWindow (display->display, vt);
2380 { 2460}
2381 int i;
2382 2461
2383 if (! (Options & Opt_transparent_all)) 2462/* ------------------------------------------------------------------------- */
2384 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 }
2385 else 2491 else
2386 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2387
2388 while (i--)
2389 if (TermWin.parent[i] != None)
2390 XClearWindow (display->display, TermWin.parent[i]);
2391 }
2392#endif 2492#endif
2393 2493 {
2394 if (really) 2494 if (selection.beg.row >= -view_start)
2395 XClearWindow (display->display, TermWin.vt); 2495 {
2396}
2397
2398/* ------------------------------------------------------------------------- */
2399void
2400rxvt_term::scr_reverse_selection ()
2401{
2402 if (selection.op && current_screen == selection.screen)
2403 {
2404 int end_row = TermWin.saveLines - TermWin.view_start;
2405 int i = selection.beg.row + TermWin.saveLines;
2406 int col, row = selection.end.row + TermWin.saveLines;
2407 rend_t *srp;
2408
2409 if (i >= end_row)
2410 col = selection.beg.col; 2496 col = selection.beg.col;
2497 row = selection.beg.row;
2498 }
2411 else 2499 else
2412 { 2500 {
2413 col = 0; 2501 col = 0;
2414 i = end_row; 2502 row = -view_start;
2415 } 2503 }
2416 2504
2417 end_row += TermWin.nrow; 2505 for (; row < min (selection.end.row, view_end); row++, col = 0)
2418 for (; i < row && i < end_row; i++, col = 0) 2506 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2419 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2420 srp[col] ^= RS_RVid; 2507 srp[col] ^= RS_RVid;
2421 2508
2422 if (i == row && i < end_row) 2509 if (row == selection.end.row)
2423 for (srp = screen.rend[i]; col < selection.end.col; col++) 2510 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2424 srp[col] ^= RS_RVid; 2511 srp[col] ^= RS_RVid;
2512 }
2425 } 2513 }
2426} 2514}
2427 2515
2428/* ------------------------------------------------------------------------- */ 2516/* ------------------------------------------------------------------------- */
2429/* 2517/*
… …
2436{ 2524{
2437 int row, wrote; 2525 int row, wrote;
2438 unsigned int width, towrite; 2526 unsigned int width, towrite;
2439 char r1[] = "\n"; 2527 char r1[] = "\n";
2440 2528
2441 for (row = TermWin.saveLines - TermWin.nscrolled; 2529 for (row = saveLines - nsaved;
2442 row < TermWin.saveLines + TermWin.nrow - 1; row++) 2530 row < saveLines + nrow - 1; row++)
2443 { 2531 {
2444 width = screen.tlen[row] >= 0 ? screen.tlen[row] 2532 width = row_buf[row].l >= 0 ? row_buf[row].l
2445 : TermWin.ncol; 2533 : ncol;
2446 for (towrite = width; towrite; towrite -= wrote) 2534 for (towrite = width; towrite; towrite -= wrote)
2447 { 2535 {
2448 wrote = write (fd, & (screen.text[row][width - towrite]), 2536 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2449 towrite); 2537 towrite);
2450 if (wrote < 0) 2538 if (wrote < 0)
2451 return; /* XXX: death, no report */ 2539 return; /* XXX: death, no report */
2452 } 2540 }
2453 if (screen.tlen[row] >= 0) 2541 if (row_buf[row].l >= 0)
2454 if (write (fd, r1, 1) <= 0) 2542 if (write (fd, r1, 1) <= 0)
2455 return; /* XXX: death, no report */ 2543 return; /* XXX: death, no report */
2456 } 2544 }
2457} 2545}
2458#endif 2546#endif
2459 2547
2460/* ------------------------------------------------------------------------- * 2548/* ------------------------------------------------------------------------- *
2461 * CHARACTER SELECTION * 2549 * CHARACTER SELECTION *
2462 * ------------------------------------------------------------------------- */ 2550 * ------------------------------------------------------------------------- */
2463
2464/*
2465 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2466 */
2467void 2551void
2468rxvt_term::selection_check (int check_more) 2552rxvt_term::selection_check (int check_more)
2469{ 2553{
2470 row_col_t pos; 2554 row_col_t pos;
2471 2555
2472 if (!selection.op) 2556 if (!selection.op)
2473 return; 2557 return;
2474 2558
2475 pos.row = pos.col = 0; 2559 pos.row = pos.col = 0;
2476 if ((selection.beg.row < - (int32_t)TermWin.nscrolled) 2560 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow)
2477 || (selection.beg.row >= TermWin.nrow) 2561 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow)
2478 || (selection.mark.row < - (int32_t)TermWin.nscrolled) 2562 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow)
2479 || (selection.mark.row >= TermWin.nrow)
2480 || (selection.end.row < - (int32_t)TermWin.nscrolled)
2481 || (selection.end.row >= TermWin.nrow)
2482 || (check_more == 1 2563 || (check_more == 1
2483 && current_screen == selection.screen 2564 && current_screen == selection.screen
2484 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2565 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2485 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2566 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2486 || (check_more == 2 2567 || (check_more == 2
… …
2488 && ROWCOL_IS_AFTER (selection.end, pos)) 2569 && ROWCOL_IS_AFTER (selection.end, pos))
2489 || (check_more == 3 2570 || (check_more == 3
2490 && ROWCOL_IS_AFTER (selection.end, pos)) 2571 && ROWCOL_IS_AFTER (selection.end, pos))
2491 || (check_more == 4 /* screen width change */ 2572 || (check_more == 4 /* screen width change */
2492 && (selection.beg.row != selection.end.row 2573 && (selection.beg.row != selection.end.row
2493 || selection.end.col > TermWin.ncol))) 2574 || selection.end.col > ncol)))
2494 CLEAR_SELECTION (); 2575 CLEAR_SELECTION ();
2495} 2576}
2496 2577
2497/* ------------------------------------------------------------------------- */ 2578/* ------------------------------------------------------------------------- */
2498/* 2579/*
2499 * Paste a selection direct to the command fd 2580 * Paste a selection direct to the command fd
2500 */ 2581 */
2501void 2582void
2502rxvt_term::paste (const unsigned char *data, unsigned int len) 2583rxvt_term::paste (char *data, unsigned int len)
2503{ 2584{
2504 unsigned int i, j, n;
2505 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE);
2506
2507#if 0
2508 /* a paste should act like the user is typing, so check scrollTtyKeypress */
2509 ZERO_SCROLLBACK (r);
2510#endif
2511
2512 /* convert normal newline chars into common keyboard Return key sequence */ 2585 /* convert normal newline chars into common keyboard Return key sequence */
2513 for (i = 0; i < len; i += PROP_SIZE) 2586 for (unsigned int i = 0; i < len; i++)
2514 { 2587 if (data[i] == C0_LF)
2515 n = min (len - i, PROP_SIZE); 2588 data[i] = C0_CR;
2516 MEMCPY (ds, data + i, n);
2517 2589
2518 for (j = 0; j < n; j++) 2590 tt_write (data, len);
2519 if (ds[j] == '\n')
2520 ds[j] = '\r';
2521
2522 tt_write (ds, (int)n);
2523 }
2524
2525 free (ds);
2526} 2591}
2527 2592
2528/* ------------------------------------------------------------------------- */ 2593/* ------------------------------------------------------------------------- */
2529/* 2594/*
2530 * Respond to a notification that a primary selection has been sent 2595 * Respond to a notification that a primary selection has been sent
2531 * EXT: SelectionNotify 2596 * EXT: SelectionNotify
2532 */ 2597 */
2533int 2598void
2534rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2599rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2535{ 2600{
2536 long nread = 0;
2537 unsigned long bytes_after;
2538 XTextProperty ct;
2539
2540 D_SELECT ((stderr, "rxvt_selection_paste (%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, selection_wait));
2541
2542 if (prop == None) /* check for failed XConvertSelection */ 2601 if (prop == None) /* check for failed XConvertSelection */
2543 { 2602 {
2544 if ((selection_type & Sel_CompoundText)) 2603 if ((selection_type & Sel_CompoundText))
2545 { 2604 {
2546 int selnum = selection_type & Sel_whereMask; 2605 int selnum = selection_type & Sel_whereMask;
… …
2559 selection_request_other (xa[XA_COMPOUND_TEXT], selnum); 2618 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2560 else 2619 else
2561 selection_type = 0; 2620 selection_type = 0;
2562 } 2621 }
2563 2622
2564 return 0; 2623 return;
2565 }
2566
2567 for (;;)
2568 { 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
2569 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), 2648 if (XGetWindowProperty (display->display, win, prop,
2570 (long) (PROP_SIZE / 4), delete_prop, 2649 ct.nitems / 4, (bytes_after + 3) / 4,
2650 delete_prop, AnyPropertyType,
2571 AnyPropertyType, &ct.encoding, &ct.format, 2651 &ct2.encoding, &ct2.format,
2572 &ct.nitems, &bytes_after, 2652 &ct2.nitems, &bytes_after,
2573 &ct.value) != Success) 2653 &ct2.value) != Success)
2574 break; 2654 goto bailout;
2575 2655
2576 if (ct.encoding == 0) 2656 // realloc should be compatible to XFree, here, and elsewhere, too
2577 { 2657 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2578 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!")); 2658 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2579 break; 2659 ct.nitems += ct2.nitems;
2580 }
2581 2660
2661 XFree (ct2.value);
2662 }
2663
2582 if (ct.value == NULL) 2664 if (ct.value == 0)
2583 { 2665 goto bailout;
2584 D_SELECT ((stderr, "rxvt_selection_paste: property shooting blanks!"));
2585 continue;
2586 }
2587 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
2588 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 ();
2589 { 2693 }
2590 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); 2694 else
2591 2695 {
2592 if (selection_wait == Sel_normal && nread == 0 2696 if (selection_wait == Sel_normal
2593 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2697 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2594 { 2698 {
2595 /* 2699 /*
2596 * pass through again trying CUT_BUFFER0 if we've come from 2700 * pass through again trying CUT_BUFFER0 if we've come from
2597 * XConvertSelection () but nothing was presented 2701 * XConvertSelection () but nothing was presented
2598 */ 2702 */
2599 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2600 selection_paste (display->root, XA_CUT_BUFFER0, False); 2703 selection_paste (display->root, XA_CUT_BUFFER0, False);
2601 } 2704 }
2602 2705
2603 nread = -1; /* discount any previous stuff */ 2706 goto bailout;
2604 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)
2605 } 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 }
2606 2718
2719 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2607 nread += ct.nitems; 2720 incr_buf_fill += ct.nitems;
2608 2721
2722 goto bailout;
2723 }
2724
2609 char **cl; 2725 char **cl;
2610 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
2611 if (XmbTextPropertyToTextList (display->display, &ct, &cl, 2742 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2612 &cr) >= 0 && cl) 2743 && cl)
2613 { 2744 {
2614 for (int i = 0; i < cr; i++) 2745 for (int i = 0; i < cr; i++)
2615 paste ((unsigned char *)cl[i], STRLEN (cl[i])); 2746 paste (cl[i], strlen (cl[i]));
2616 2747
2617 XFreeStringList (cl); 2748 XFreeStringList (cl);
2618 } 2749 }
2619 else 2750 else
2620 paste (ct.value, ct.nitems); 2751 paste ((char *)ct.value, ct.nitems); // paste raw
2621 2752
2622 if (bytes_after == 0) 2753bailout:
2623 break;
2624
2625 XFree (ct.value);
2626 }
2627
2628 if (ct.value)
2629 XFree (ct.value); 2754 XFree (ct.value);
2630 2755
2631 if (selection_wait == Sel_normal) 2756 if (selection_wait == Sel_normal)
2632 selection_wait = Sel_none; 2757 selection_wait = Sel_none;
2633
2634 D_SELECT ((stderr, "rxvt_selection_paste: bytes written: %ld", nread));
2635 return (int)nread;
2636} 2758}
2637 2759
2638void 2760void
2639rxvt_term::incr_cb (time_watcher &w) 2761rxvt_term::incr_cb (time_watcher &w)
2640{ 2762{
2641 selection_wait = Sel_none; 2763 selection_wait = Sel_none;
2642 2764
2765 incr_buf_size = 0;
2766 free (incr_buf);
2767
2643 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2768 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2644} 2769}
2645 2770
2646/*
2647 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2648 */
2649void 2771void
2650rxvt_term::selection_property (Window win, Atom prop) 2772rxvt_term::selection_property (Window win, Atom prop)
2651{ 2773{
2652 int reget_time = 0; 2774 if (prop == None || selection_wait != Sel_incr)
2653
2654 if (prop == None)
2655 return; 2775 return;
2656 2776
2657 D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop));
2658 if (selection_wait == Sel_normal)
2659 {
2660 int a, afmt;
2661 Atom atype;
2662 unsigned long bytes_after, nitems;
2663 unsigned char *s = NULL;
2664
2665 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False,
2666 xa[XA_INCR], &atype, &afmt, &nitems,
2667 &bytes_after, &s);
2668 if (s)
2669 XFree (s);
2670 if (a != Success)
2671 return;
2672
2673#ifndef __CYGWIN32__
2674 if (atype == xa[XA_INCR])
2675 { /* start an INCR transfer */
2676 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer"));
2677 XDeleteProperty (display->display, win, prop);
2678 XFlush (display->display);
2679 reget_time = 1;
2680 selection_wait = Sel_incr;
2681 }
2682#endif
2683
2684 }
2685 else if (selection_wait == Sel_incr)
2686 {
2687 reget_time = 1;
2688
2689 if (selection_paste (win, prop, True) == -1) 2777 selection_paste (win, prop, true);
2690 {
2691 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end"));
2692 selection_wait = Sel_none;
2693 incr_ev.stop ();
2694 }
2695 }
2696 if (reget_time) /* received more data so reget time */
2697 incr_ev.start (NOW + 10);
2698} 2778}
2699 2779
2700/* ------------------------------------------------------------------------- */ 2780/* ------------------------------------------------------------------------- */
2701/* 2781/*
2702 * Request the current selection: 2782 * Request the current selection:
… …
2708 * EXT: button 2 release 2788 * EXT: button 2 release
2709 */ 2789 */
2710void 2790void
2711rxvt_term::selection_request (Time tm, int x, int y) 2791rxvt_term::selection_request (Time tm, int x, int y)
2712{ 2792{
2713 D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y));
2714
2715 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2793 if (x < 0 || x >= width || y < 0 || y >= height)
2716 return; /* outside window */ 2794 return; /* outside window */
2717 2795
2718 if (selection.text) 2796 if (selection.text)
2719 { /* internal selection */ 2797 { /* internal selection */
2720 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2721 char *str = rxvt_wcstombs (selection.text, selection.len); 2798 char *str = rxvt_wcstombs (selection.text, selection.len);
2722 paste ((unsigned char *)str, strlen (str)); 2799 paste (str, strlen (str));
2723 free (str); 2800 free (str);
2724 return; 2801 return;
2725 } 2802 }
2726 else 2803 else
2727 { 2804 {
… …
2739#else 2816#else
2740 selection_type = Sel_CompoundText; 2817 selection_type = Sel_CompoundText;
2741 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2818 if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
2742 return; 2819 return;
2743#endif 2820#endif
2744
2745 } 2821 }
2746 } 2822 }
2747 2823
2748 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2824 selection_wait = Sel_none; /* don't loop in selection_paste () */
2749 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2750 selection_paste (display->root, XA_CUT_BUFFER0, False); 2825 selection_paste (display->root, XA_CUT_BUFFER0, false);
2751} 2826}
2752 2827
2753int 2828int
2754rxvt_term::selection_request_other (Atom target, int selnum) 2829rxvt_term::selection_request_other (Atom target, int selnum)
2755{ 2830{
2756 Atom sel; 2831 Atom sel;
2757#ifdef DEBUG_SELECT
2758 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2759#endif
2760 2832
2761 selection_type |= selnum; 2833 selection_type |= selnum;
2762 2834
2763 if (selnum == Sel_Primary) 2835 if (selnum == Sel_Primary)
2764 sel = XA_PRIMARY; 2836 sel = XA_PRIMARY;
… …
2767 else 2839 else
2768 sel = xa[XA_CLIPBOARD]; 2840 sel = xa[XA_CLIPBOARD];
2769 2841
2770 if (XGetSelectionOwner (display->display, sel) != None) 2842 if (XGetSelectionOwner (display->display, sel) != None)
2771 { 2843 {
2772 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum]));
2773 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2844 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2774 TermWin.vt, selection_request_time); 2845 vt, selection_request_time);
2775 return 1; 2846 return 1;
2776 } 2847 }
2777 2848
2778 return 0; 2849 return 0;
2779} 2850}
… …
2784 * EXT: SelectionClear 2855 * EXT: SelectionClear
2785 */ 2856 */
2786void 2857void
2787rxvt_term::selection_clear () 2858rxvt_term::selection_clear ()
2788{ 2859{
2789 D_SELECT ((stderr, "rxvt_selection_clear ()"));
2790
2791 want_refresh = 1; 2860 want_refresh = 1;
2792 free (selection.text); 2861 free (selection.text);
2793 selection.text = NULL; 2862 selection.text = NULL;
2794 selection.len = 0; 2863 selection.len = 0;
2795 CLEAR_SELECTION (); 2864 CLEAR_SELECTION ();
… …
2804 * EXT: button 1 or 3 release 2873 * EXT: button 1 or 3 release
2805 */ 2874 */
2806void 2875void
2807rxvt_term::selection_make (Time tm) 2876rxvt_term::selection_make (Time tm)
2808{ 2877{
2809 int i, col, end_col, row, end_row; 2878 int i;
2810 wchar_t *new_selection_text; 2879 wchar_t *new_selection_text;
2811 text_t *t; 2880 text_t *t;
2812 2881
2813 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
2814 switch (selection.op) 2882 switch (selection.op)
2815 { 2883 {
2816 case SELECTION_CONT: 2884 case SELECTION_CONT:
2817 break; 2885 break;
2818 case SELECTION_INIT: 2886 case SELECTION_INIT:
… …
2828 selection.op = SELECTION_DONE; 2896 selection.op = SELECTION_DONE;
2829 2897
2830 if (selection.clicks == 4) 2898 if (selection.clicks == 4)
2831 return; /* nothing selected, go away */ 2899 return; /* nothing selected, go away */
2832 2900
2901 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2902 return;
2903
2833 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); 2904 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2834 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));
2835 2906
2836 col = selection.beg.col;
2837 MAX_IT (col, 0);
2838 row = selection.beg.row + TermWin.saveLines;
2839 end_row = selection.end.row + TermWin.saveLines;
2840 int ofs = 0; 2907 int ofs = 0;
2841 int extra = 0; 2908 int extra = 0;
2842 2909
2910 int col = selection.beg.col;
2911 int row = selection.beg.row;
2912
2913 int end_col;
2914
2843 for (; row <= end_row; row++, col = 0) 2915 for (; row <= selection.end.row; row++, col = 0)
2844 { 2916 {
2845 t = &(screen.text[row][col]); 2917#if ENABLE_FRILLS
2846 2918 if (selection.rect)
2847 end_col = screen.tlen[row]; 2919 {
2848 2920 col = selection.beg.col;
2849 if (end_col == -1)
2850 end_col = TermWin.ncol; 2921 end_col = ncol + 1;
2922 }
2923 else
2924#endif
2925 end_col = ROW(row).l;
2851 2926
2927 col = max (col, 0);
2928
2852 if (row == end_row) 2929 if (row == selection.end.row
2930#if ENABLE_FRILLS
2931 || selection.rect
2932#endif
2933 )
2853 MIN_IT (end_col, selection.end.col); 2934 min_it (end_col, selection.end.col);
2935
2936 t = ROW(row).t + col;
2854 2937
2855 for (; col < end_col; col++) 2938 for (; col < end_col; col++)
2856 { 2939 {
2857 if (*t == NOCHAR) 2940 if (*t == NOCHAR)
2858 t++; 2941 t++;
… …
2875#endif 2958#endif
2876 else 2959 else
2877 new_selection_text[ofs++] = *t++; 2960 new_selection_text[ofs++] = *t++;
2878 } 2961 }
2879 2962
2880 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
2881 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;
2882 } 2977 }
2883 2978
2884 if (end_col != selection.end.col) 2979 if (end_col != selection.end.col)
2885 new_selection_text[ofs++] = L'\n'; 2980 new_selection_text[ofs++] = C0_LF;
2886 2981
2887 new_selection_text[ofs] = 0; 2982 new_selection_text[ofs] = 0;
2888 2983
2889 if (ofs == 0) 2984 if (ofs == 0)
2890 { 2985 {
… …
2896 2991
2897 // 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
2898 selection.len = ofs; 2993 selection.len = ofs;
2899 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));
2900 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
2901 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 3007 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2902 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 3008 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3009 {
2903 display->set_selection_owner (this); 3010 display->set_selection_owner (this);
3011 return true;
3012 }
2904 else 3013 else
2905 rxvt_warn ("can't get primary selection, ignoring.\n"); 3014 return false;
2906 3015
2907#if 0 3016#if 0
2908 XTextProperty ct; 3017 XTextProperty ct;
2909 3018
2910 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3019 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2911 { 3020 {
2912 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 3021 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2913 PropModeReplace, ct.value, ct.nitems);
2914 XFree (ct.value); 3022 XFree (ct.value);
2915 } 3023 }
2916#endif 3024#endif
2917
2918 selection_time = tm;
2919 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2920} 3025}
2921 3026
2922/* ------------------------------------------------------------------------- */ 3027/* ------------------------------------------------------------------------- */
2923/* 3028/*
2924 * 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
2925 * EXT: button 1 press 3030 * EXT: button 1 press
2926 */ 3031 */
2927void 3032void
2928rxvt_term::selection_click (int clicks, int x, int y) 3033rxvt_term::selection_click (int clicks, int x, int y)
2929{ 3034{
2930 D_SELECT ((stderr, "rxvt_selection_click (%d, %d, %d)", clicks, x, y));
2931
2932 clicks = ((clicks - 1) % 3) + 1; 3035 clicks = ((clicks - 1) % 3) + 1;
2933 selection.clicks = clicks; /* save clicks so extend will work */ 3036 selection.clicks = clicks; /* save clicks so extend will work */
2934 3037
2935 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3038 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2936 3039
2937 if (clicks == 2 || clicks == 3) 3040 if (clicks == 2 || clicks == 3)
2938 selection_extend_colrow (selection.mark.col, 3041 selection_extend_colrow (selection.mark.col,
2939 selection.mark.row + TermWin.view_start, 3042 selection.mark.row + view_start,
2940 0, /* button 3 */ 3043 0, /* button 3 */
2941 1, /* button press */ 3044 1, /* button press */
2942 0); /* click change */ 3045 0); /* click change */
2943} 3046}
2944 3047
… …
2948 */ 3051 */
2949void 3052void
2950rxvt_term::selection_start_colrow (int col, int row) 3053rxvt_term::selection_start_colrow (int col, int row)
2951{ 3054{
2952 want_refresh = 1; 3055 want_refresh = 1;
3056
3057 selection.mark.row = row - view_start;
2953 selection.mark.col = col; 3058 selection.mark.col = col;
2954 selection.mark.row = row - TermWin.view_start;
2955 3059
2956 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); 3060 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1);
2957 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); 3061 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
2958 MAX_IT (selection.mark.col, 0);
2959 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
2960 3062
2961 while (selection.mark.col > 0 3063 while (selection.mark.col > 0
2962 && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR) 3064 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
2963 --selection.mark.col; 3065 --selection.mark.col;
2964 3066
2965 if (selection.op) 3067 if (selection.op)
2966 { /* clear the old selection */ 3068 { /* clear the old selection */
2967 selection.beg.row = selection.end.row = selection.mark.row; 3069 selection.beg.row = selection.end.row = selection.mark.row;
… …
2978 * We now only find out the boundary in one direction 3080 * We now only find out the boundary in one direction
2979 */ 3081 */
2980 3082
2981/* 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 */
2982#define DELIMIT_TEXT(x) \ 3084#define DELIMIT_TEXT(x) \
2983 (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)))
2984#define DELIMIT_REND(x) 1 3086#define DELIMIT_REND(x) 1
2985 3087
2986void 3088void
2987rxvt_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)
2988{ 3090{
… …
2991 text_t *stp; 3093 text_t *stp;
2992 rend_t *srp; 3094 rend_t *srp;
2993 3095
2994 if (dirn == UP) 3096 if (dirn == UP)
2995 { 3097 {
2996 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 3098 bound.row = - nsaved - 1;
2997 bound.col = 0; 3099 bound.col = 0;
2998 dirnadd = -1; 3100 dirnadd = -1;
2999 } 3101 }
3000 else 3102 else
3001 { 3103 {
3002 bound.row = TermWin.saveLines + TermWin.nrow; 3104 bound.row = nrow;
3003 bound.col = TermWin.ncol - 1; 3105 bound.col = ncol - 1;
3004 dirnadd = 1; 3106 dirnadd = 1;
3005 } 3107 }
3006 3108
3007 row = mark->row + TermWin.saveLines; 3109 row = mark->row;
3008 col = mark->col; 3110 col = max (mark->col, 0);
3009 MAX_IT (col, 0); 3111
3010 /* find the edge of a word */ 3112 /* find the edge of a word */
3011 stp = & (screen.text[row][col]); 3113 stp = ROW(row).t + col; w1 = DELIMIT_TEXT (*stp);
3012 w1 = DELIMIT_TEXT (*stp); 3114 srp = ROW(row).r + col; w2 = DELIMIT_REND (*srp);
3013
3014 srp = (&screen.rend[row][col]);
3015 w2 = DELIMIT_REND (*srp);
3016 3115
3017 for (;;) 3116 for (;;)
3018 { 3117 {
3019 for (; col != bound.col; col += dirnadd) 3118 for (; col != bound.col; col += dirnadd)
3020 { 3119 {
… …
3030 break; 3129 break;
3031 } 3130 }
3032 3131
3033 if ((col == bound.col) && (row != bound.row)) 3132 if ((col == bound.col) && (row != bound.row))
3034 { 3133 {
3035 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) 3134 if (ROW(row - (dirn == UP ? 1 : 0)).is_longer ())
3036 { 3135 {
3037 trow = row + dirnadd; 3136 trow = row + dirnadd;
3038 tcol = dirn == UP ? TermWin.ncol - 1 : 0; 3137 tcol = dirn == UP ? ncol - 1 : 0;
3039 3138
3040 if (screen.text[trow] == NULL) 3139 if (!ROW(trow).t)
3041 break; 3140 break;
3042 3141
3043 stp = & (screen.text[trow][tcol]); 3142 stp = ROW(trow).t + tcol;
3044 srp = & (screen.rend[trow][tcol]); 3143 srp = ROW(trow).r + tcol;
3045 3144
3046 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3145 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
3047 break; 3146 break;
3048 3147
3049 row = trow; 3148 row = trow;
… …
3052 } 3151 }
3053 } 3152 }
3054 break; 3153 break;
3055 } 3154 }
3056 3155
3057Old_Word_Selection_You_Die:
3058 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));
3059
3060 if (dirn == DN) 3156 if (dirn == DN)
3061 col++; /* put us on one past the end */ 3157 col++; /* put us on one past the end */
3062 3158
3063 /* Poke the values back in */ 3159 /* Poke the values back in */
3064 ret->row = row - TermWin.saveLines; 3160 ret->row = row;
3065 ret->col = col; 3161 ret->col = col;
3066} 3162}
3067 3163
3068/* ------------------------------------------------------------------------- */ 3164/* ------------------------------------------------------------------------- */
3069/* 3165/*
… …
3074 * flag == 2 ==> button 3 motion 3170 * flag == 2 ==> button 3 motion
3075 */ 3171 */
3076void 3172void
3077rxvt_term::selection_extend (int x, int y, int flag) 3173rxvt_term::selection_extend (int x, int y, int flag)
3078{ 3174{
3079 int col, row; 3175 int col = clamp (Pixel2Col (x), 0, ncol);
3080 3176 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3081 col = Pixel2Col (x);
3082 row = Pixel2Row (y);
3083 MAX_IT (row, 0);
3084 MIN_IT (row, (int)TermWin.nrow - 1);
3085 MAX_IT (col, 0);
3086 MIN_IT (col, (int)TermWin.ncol);
3087 3177
3088 /* 3178 /*
3089 * 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
3090 * 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
3091 * 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
3092 * be _past_ a character for it to be selected. 3182 * be _past_ a character for it to be selected.
3093 */ 3183 */
3094 if (((selection.clicks % 3) == 1) && !flag 3184 if (((selection.clicks % 3) == 1) && !flag
3095 && (col == selection.mark.col 3185 && (col == selection.mark.col
3096 && (row == selection.mark.row + TermWin.view_start))) 3186 && (row == selection.mark.row + view_start)))
3097 { 3187 {
3098 /* select nothing */ 3188 /* select nothing */
3099 selection.beg.row = selection.end.row = 0; 3189 selection.beg.row = selection.end.row = 0;
3100 selection.beg.col = selection.end.col = 0; 3190 selection.beg.col = selection.end.col = 0;
3101 selection.clicks = 4; 3191 selection.clicks = 4;
3102 want_refresh = 1; 3192 want_refresh = 1;
3103 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
3104 return; 3193 return;
3105 } 3194 }
3106 3195
3107 if (selection.clicks == 4) 3196 if (selection.clicks == 4)
3108 selection.clicks = 1; 3197 selection.clicks = 1;
… …
3117 * Extend the selection to the specified col/row 3206 * Extend the selection to the specified col/row
3118 */ 3207 */
3119void 3208void
3120rxvt_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)
3121{ 3210{
3122 int16_t ncol = TermWin.ncol;
3123 int end_col;
3124 row_col_t pos; 3211 row_col_t pos;
3125 enum { 3212 enum {
3126 LEFT, RIGHT 3213 LEFT, RIGHT
3127 } closeto = RIGHT; 3214 } closeto = RIGHT;
3128 3215
3129 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));
3130 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));
3131
3132 want_refresh = 1; 3216 want_refresh = 1;
3217
3133 switch (selection.op) 3218 switch (selection.op)
3134 { 3219 {
3135 case SELECTION_INIT: 3220 case SELECTION_INIT:
3136 CLEAR_SELECTION (); 3221 CLEAR_SELECTION ();
3137 selection.op = SELECTION_BEGIN; 3222 selection.op = SELECTION_BEGIN;
… …
3150 selection_start_colrow (col, row); 3235 selection_start_colrow (col, row);
3151 /* FALLTHROUGH */ 3236 /* FALLTHROUGH */
3152 default: 3237 default:
3153 return; 3238 return;
3154 } 3239 }
3240
3155 if (selection.beg.col == selection.end.col 3241 if (selection.beg.col == selection.end.col
3156 && selection.beg.col != selection.mark.col 3242 && selection.beg.col != selection.mark.col
3157 && selection.beg.row == selection.end.row 3243 && selection.beg.row == selection.end.row
3158 && selection.beg.row != selection.mark.row) 3244 && selection.beg.row != selection.mark.row)
3159 { 3245 {
3160 selection.beg.col = selection.end.col = selection.mark.col; 3246 selection.beg.col = selection.end.col = selection.mark.col;
3161 selection.beg.row = selection.end.row = selection.mark.row; 3247 selection.beg.row = selection.end.row = selection.mark.row;
3162 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));
3163 } 3248 }
3164 3249
3165 pos.col = col; 3250 pos.col = col;
3166 pos.row = row; 3251 pos.row = row - view_start;
3167
3168 pos.row -= TermWin.view_start; /* adjust for scroll */
3169 3252
3170 /* 3253 /*
3171 * 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
3172 * in the way button3 drag extension works. 3255 * in the way button3 drag extension works.
3173 * We're either doing: button1 drag; button3 press; or button3 drag 3256 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3210 } 3293 }
3211 else 3294 else
3212 { /* button1 drag or button3 drag */ 3295 { /* button1 drag or button3 drag */
3213 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3296 if (ROWCOL_IS_AFTER (selection.mark, pos))
3214 { 3297 {
3215 if ((selection.mark.row == selection.end.row) 3298 if (selection.mark.row == selection.end.row
3216 && (selection.mark.col == selection.end.col) 3299 && selection.mark.col == selection.end.col
3300 && clickchange
3217 && clickchange && selection.clicks == 2) 3301 && selection.clicks == 2)
3218 selection.mark.col--; 3302 selection.mark.col--;
3219 3303
3220 selection.beg.row = pos.row; 3304 selection.beg.row = pos.row;
3221 selection.beg.col = pos.col; 3305 selection.beg.col = pos.col;
3222 selection.end.row = selection.mark.row; 3306 selection.end.row = selection.mark.row;
… …
3231 } 3315 }
3232 } 3316 }
3233 3317
3234 if (selection.clicks == 1) 3318 if (selection.clicks == 1)
3235 { 3319 {
3236 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3320 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3237 3321 && !ROW(selection.beg.row).is_longer ()
3238 if (end_col != -1 && selection.beg.col > end_col) 3322#if ENABLE_FRILLS
3323 && !selection.rect
3324#endif
3239 { 3325 )
3240#if 1
3241 selection.beg.col = ncol; 3326 selection.beg.col = ncol;
3242#else 3327
3243 if (selection.beg.row != selection.end.row) 3328 if (
3244 selection.beg.col = ncol; 3329 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3245 else 3330 && !ROW(selection.end.row).is_longer ()
3246 selection.beg.col = selection.mark.col; 3331#if ENABLE_FRILLS
3332 && !selection.rect
3247#endif 3333#endif
3248 } 3334 )
3249
3250 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3251
3252 if (end_col != -1 && selection.end.col > end_col)
3253 selection.end.col = ncol; 3335 selection.end.col = ncol;
3254 } 3336 }
3255 else if (selection.clicks == 2) 3337 else if (selection.clicks == 2)
3256 { 3338 {
3257 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3339 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3258 selection.end.col--; 3340 selection.end.col--;
3259 3341
3260 selection_delimit_word (UP, & (selection.beg), & (selection.beg)); 3342 if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3343 {
3261 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 }
3262 } 3347 }
3263 else if (selection.clicks == 3) 3348 else if (selection.clicks == 3)
3264 { 3349 {
3265#ifndef NO_FRILLS 3350#if ENABLE_FRILLS
3266 if ((Options & Opt_tripleclickwords)) 3351 if (OPTION (Opt_tripleclickwords))
3267 { 3352 {
3268 int end_row; 3353 selection_delimit_word (UP, &selection.beg, &selection.beg);
3269 3354
3270 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3271 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3272
3273 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++)
3274 { 3356 {
3275 end_col = screen.tlen[end_row + TermWin.saveLines]; 3357 if (!ROW(end_row).is_longer ())
3276
3277 if (end_col != -1)
3278 { 3358 {
3279 selection.end.row = end_row; 3359 selection.end.row = end_row;
3280 selection.end.col = end_col; 3360 selection.end.col = ROW(end_row).l;
3281 selection_remove_trailing_spaces (); 3361 selection_remove_trailing_spaces ();
3282 break; 3362 break;
3283 } 3363 }
3284 } 3364 }
3285 } 3365 }
3286 else 3366 else
3287#endif 3367#endif
3288 { 3368 {
3289 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3369 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3290 selection.mark.col++; 3370 selection.mark.col++;
3371
3291 selection.beg.col = 0; 3372 selection.beg.col = 0;
3292 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++;
3293 } 3383 }
3294 } 3384 }
3295 3385
3296 if (button3 && buttonpress) 3386 if (button3 && buttonpress)
3297 { /* mark may need to be changed */ 3387 { /* mark may need to be changed */
3298 if (closeto == LEFT) 3388 if (closeto == LEFT)
3299 { 3389 {
3300 selection.mark.row = selection.end.row; 3390 selection.mark.row = selection.end.row;
3301 selection.mark.col = selection.end.col 3391 selection.mark.col = selection.end.col - (selection.clicks == 2);
3302 - (selection.clicks == 2);
3303 } 3392 }
3304 else 3393 else
3305 { 3394 {
3306 selection.mark.row = selection.beg.row; 3395 selection.mark.row = selection.beg.row;
3307 selection.mark.col = selection.beg.col; 3396 selection.mark.col = selection.beg.col;
3308 } 3397 }
3309 } 3398 }
3310 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));
3311}
3312 3399
3313#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
3314void 3407void
3315rxvt_term::selection_remove_trailing_spaces () 3408rxvt_term::selection_remove_trailing_spaces ()
3316{ 3409{
3317 int32_t end_col, end_row; 3410 int32_t end_col, end_row;
3318 text_t *stp; 3411 text_t *stp;
3319 3412
3320 end_col = selection.end.col; 3413 end_col = selection.end.col;
3321 end_row = selection.end.row; 3414 end_row = selection.end.row;
3415
3322 for ( ; end_row >= selection.beg.row; ) 3416 for (; end_row >= selection.beg.row; )
3323 { 3417 {
3324 stp = screen.text[end_row + TermWin.saveLines]; 3418 stp = ROW(end_row).t;
3419
3325 while (--end_col >= 0) 3420 while (--end_col >= 0)
3326 { 3421 {
3327 if (stp[end_col] != ' ' && stp[end_col] != '\t') 3422 if (stp[end_col] != NOCHAR
3423 && !unicode::is_space (stp[end_col]))
3328 break; 3424 break;
3329 } 3425 }
3426
3330 if (end_col >= 0 3427 if (end_col >= 0
3331 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) 3428 || !ROW(end_row - 1).is_longer ())
3332 { 3429 {
3333 selection.end.col = end_col + 1; 3430 selection.end.col = end_col + 1;
3334 selection.end.row = end_row; 3431 selection.end.row = end_row;
3335 break; 3432 break;
3336 } 3433 }
3434
3337 end_row--; 3435 end_row--;
3338 end_col = TermWin.ncol; 3436 end_col = ncol;
3339 } 3437 }
3438
3340 if (selection.mark.row > selection.end.row) 3439 if (selection.mark.row > selection.end.row)
3341 { 3440 {
3342 selection.mark.row = selection.end.row; 3441 selection.mark.row = selection.end.row;
3343 selection.mark.col = selection.end.col; 3442 selection.mark.col = selection.end.col;
3344 } 3443 }
… …
3360 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3459 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3361} 3460}
3362 3461
3363/* ------------------------------------------------------------------------- */ 3462/* ------------------------------------------------------------------------- */
3364/* 3463/*
3365 * On some systems, the Atom typedef is 64 bits wide. We need to have a type
3366 * that is exactly 32 bits wide, because a format of 64 is not allowed by
3367 * the X11 protocol.
3368 */
3369typedef CARD32 Atom32;
3370
3371/* ------------------------------------------------------------------------- */
3372/*
3373 * Respond to a request for our current selection 3464 * Respond to a request for our current selection
3374 * EXT: SelectionRequest 3465 * EXT: SelectionRequest
3375 */ 3466 */
3376void 3467void
3377rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3468rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3378{ 3469{
3379 XSelectionEvent ev; 3470 XSelectionEvent ev;
3380 XTextProperty ct; 3471 dDisp;
3381 XICCEncodingStyle style;
3382 Atom target;
3383 3472
3384 ev.type = SelectionNotify; 3473 ev.type = SelectionNotify;
3385 ev.property = None; 3474 ev.property = None;
3386 ev.display = rq.display; 3475 ev.display = rq.display;
3387 ev.requestor = rq.requestor; 3476 ev.requestor = rq.requestor;
… …
3389 ev.target = rq.target; 3478 ev.target = rq.target;
3390 ev.time = rq.time; 3479 ev.time = rq.time;
3391 3480
3392 if (rq.target == xa[XA_TARGETS]) 3481 if (rq.target == xa[XA_TARGETS])
3393 { 3482 {
3394 Atom32 target_list[6]; 3483 Atom target_list[6];
3395 Atom32 *target = target_list; 3484 Atom *target = target_list;
3396 3485
3397 *target++ = (Atom32) xa[XA_TARGETS]; 3486 *target++ = xa[XA_TARGETS];
3398 *target++ = (Atom32) xa[XA_TIMESTAMP]; 3487 *target++ = xa[XA_TIMESTAMP];
3399 *target++ = (Atom32) XA_STRING; 3488 *target++ = XA_STRING;
3400 *target++ = (Atom32) xa[XA_TEXT]; 3489 *target++ = xa[XA_TEXT];
3401 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3490 *target++ = xa[XA_COMPOUND_TEXT];
3402#if X_HAVE_UTF8_STRING 3491#if X_HAVE_UTF8_STRING
3403 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3492 *target++ = xa[XA_UTF8_STRING];
3404#endif 3493#endif
3405 3494
3406 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3495 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM,
3407 (8 * sizeof (target_list[0])), PropModeReplace, 3496 32, PropModeReplace,
3408 (unsigned char *)target_list, 3497 (unsigned char *)target_list, target - target_list);
3409 target - target_list);
3410 ev.property = rq.property; 3498 ev.property = rq.property;
3411 } 3499 }
3500#if TODO // TODO
3412 else if (rq.target == xa[XA_MULTIPLE]) 3501 else if (rq.target == xa[XA_MULTIPLE])
3413 { 3502 {
3414 /* TODO: Handle MULTIPLE */ 3503 /* TODO: Handle MULTIPLE */
3415 } 3504 }
3505#endif
3416 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3506 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3417 { 3507 {
3418 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3508 XChangeProperty (disp, rq.requestor, rq.property, rq.target,
3419 (8 * sizeof (Time)), PropModeReplace,
3420 (unsigned char *)&selection_time, 1); 3509 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3421 ev.property = rq.property; 3510 ev.property = rq.property;
3422 } 3511 }
3423 else if (rq.target == XA_STRING 3512 else if (rq.target == XA_STRING
3424 || rq.target == xa[XA_TEXT] 3513 || rq.target == xa[XA_TEXT]
3425 || rq.target == xa[XA_COMPOUND_TEXT] 3514 || rq.target == xa[XA_COMPOUND_TEXT]
3426 || rq.target == xa[XA_UTF8_STRING] 3515 || rq.target == xa[XA_UTF8_STRING]
3427 ) 3516 )
3428 { 3517 {
3518 XTextProperty ct;
3519 Atom target = rq.target;
3429 short freect = 0; 3520 short freect = 0;
3430 int selectlen; 3521 int selectlen;
3431 wchar_t *cl; 3522 wchar_t *cl;
3432 3523 enum {
3433 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;
3434 3533
3435 if (target == XA_STRING) 3534 if (target == XA_STRING)
3436 // 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
3437 // will ask for another format anyways. 3536 // will ask for another format anyways.
3438 style = XStringStyle; 3537 style = enc_string;
3439 else if (target == xa[XA_TEXT]) 3538 else if (target == xa[XA_TEXT])
3440 style = XStdICCTextStyle; 3539 style = enc_text;
3441 else if (target == xa[XA_COMPOUND_TEXT]) 3540 else if (target == xa[XA_COMPOUND_TEXT])
3442 style = XCompoundTextStyle; 3541 style = enc_compound_text;
3443#if X_HAVE_UTF8_STRING 3542#if ENABLE_FRILLS
3444 else if (target == xa[XA_UTF8_STRING]) 3543 else if (target == xa[XA_UTF8_STRING])
3445 style = XUTF8StringStyle; 3544 style = enc_utf8;
3446#endif 3545#endif
3447 else 3546 else
3448 { 3547 {
3449 target = xa[XA_COMPOUND_TEXT]; 3548 target = xa[XA_COMPOUND_TEXT];
3450 style = XCompoundTextStyle; 3549 style = enc_compound_text;
3451 } 3550 }
3452 3551
3453 if (selection.text) 3552 if (selection.text)
3454 { 3553 {
3455 cl = selection.text; 3554 cl = selection.text;
… …
3459 { 3558 {
3460 cl = L""; 3559 cl = L"";
3461 selectlen = 0; 3560 selectlen = 0;
3462 } 3561 }
3463 3562
3464 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it 3563#if ENABLE_FRILLS
3465 // 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
3466 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3576 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3467 freect = 1; 3577 freect = 1;
3468 else 3578 else
3469 { 3579 {
3470 /* if we failed to convert then send it raw */ 3580 /* if we failed to convert then send it raw */
3471 ct.value = (unsigned char *)cl; 3581 ct.value = (unsigned char *)cl;
3472 ct.nitems = selectlen; 3582 ct.nitems = selectlen;
3583 ct.encoding = target;
3473 } 3584 }
3474 3585
3475 XChangeProperty (display->display, rq.requestor, rq.property, 3586 XChangeProperty (disp, rq.requestor, rq.property,
3476 target, 8, PropModeReplace, 3587 ct.encoding, 8, PropModeReplace,
3477 ct.value, (int)ct.nitems); 3588 ct.value, (int)ct.nitems);
3478 ev.property = rq.property; 3589 ev.property = rq.property;
3479 3590
3480 if (freect) 3591 if (freect)
3481 XFree (ct.value); 3592 XFree (ct.value);
3482 } 3593 }
3483 3594
3484 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3595 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev);
3485} 3596}
3486 3597
3487/* ------------------------------------------------------------------------- * 3598/* ------------------------------------------------------------------------- *
3488 * MOUSE ROUTINES * 3599 * MOUSE ROUTINES *
3489 * ------------------------------------------------------------------------- */ 3600 * ------------------------------------------------------------------------- */
… …
3493 */ 3604 */
3494void 3605void
3495rxvt_term::pixel_position (int *x, int *y) 3606rxvt_term::pixel_position (int *x, int *y)
3496{ 3607{
3497 *x = Pixel2Col (*x); 3608 *x = Pixel2Col (*x);
3498 /* MAX_IT (*x, 0); MIN_IT (*x, (int)TermWin.ncol - 1); */ 3609 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3499 *y = Pixel2Row (*y); 3610 *y = Pixel2Row (*y);
3500 /* MAX_IT (*y, 0); MIN_IT (*y, (int)TermWin.nrow - 1); */ 3611 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3501} 3612}
3502 3613
3503/* ------------------------------------------------------------------------- */ 3614/* ------------------------------------------------------------------------- */
3504#ifdef USE_XIM 3615#ifdef USE_XIM
3505void 3616void
3506rxvt_term::im_set_position (XPoint *pos) 3617rxvt_term::im_set_position (XPoint &pos)
3507{ 3618{
3508 XWindowAttributes xwa; 3619 XWindowAttributes xwa;
3509 3620
3510 XGetWindowAttributes (display->display, TermWin.vt, &xwa); 3621 XGetWindowAttributes (display->display, vt, &xwa);
3622
3511 pos->x = Col2Pixel (screen.cur.col) + xwa.x; 3623 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3512 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; 3624 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3513} 3625}
3514
3515#endif 3626#endif
3516/* ------------------------------------------------------------------------- */ 3627
3517 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
3518/* ------------------------------------------------------------------------- * 3761/* ------------------------------------------------------------------------- */
3519 * DEBUG ROUTINES *
3520 * ------------------------------------------------------------------------- */
3521#if 0
3522void
3523rxvt_debug_colors (void)
3524{
3525 int color;
3526 const char *name[] =
3527 {
3528 "fg", "bg",
3529 "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white"
3530 };
3531 3762
3532 fprintf (stderr, "Color ( ");
3533 if (rstyle & RS_RVid)
3534 fprintf (stderr, "rvid ");
3535 if (rstyle & RS_Bold)
3536 fprintf (stderr, "bold ");
3537 if (rstyle & RS_Blink)
3538 fprintf (stderr, "blink ");
3539 if (rstyle & RS_Uline)
3540 fprintf (stderr, "uline ");
3541 fprintf (stderr, "): ");
3542
3543 color = GET_FGCOLOR (rstyle);
3544#ifndef NO_BRIGHTCOLOR
3545 if (color >= minBrightCOLOR && color <= maxBrightCOLOR)
3546 {
3547 color -= (minBrightCOLOR - minCOLOR);
3548 fprintf (stderr, "bright ");
3549 }
3550#endif
3551 fprintf (stderr, "%s on ", name[color]);
3552
3553 color = GET_BGCOLOR (rstyle);
3554#ifndef NO_BRIGHTCOLOR
3555 if (color >= minBrightCOLOR && color <= maxBrightCOLOR)
3556 {
3557 color -= (minBrightCOLOR - minCOLOR);
3558 fprintf (stderr, "bright ");
3559 }
3560#endif
3561 fprintf (stderr, "%s\n", name[color]);
3562}
3563#endif

Diff Legend

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