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

Diff Legend

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