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

Diff Legend

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