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

Diff Legend

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