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.66 by pcg, Sun Mar 28 02:07:08 2004 UTC vs.
Revision 1.308 by root, Tue Jul 15 16:41:22 2008 UTC

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

Diff Legend

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