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

Diff Legend

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