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

Diff Legend

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