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.54 by pcg, Thu Mar 11 00:53:19 2004 UTC vs.
Revision 1.220 by root, Mon Jan 9 23:18:49 2006 UTC

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

Diff Legend

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