ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

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

Diff Legend

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