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.71 by pcg, Thu Apr 8 20:31:45 2004 UTC vs.
Revision 1.308 by root, Tue Jul 15 16:41:22 2008 UTC

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

Diff Legend

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