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

Diff Legend

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