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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.68 by pcg, Sun Apr 4 14:35:00 2004 UTC vs.
Revision 1.327 by root, Wed Nov 5 14:43:54 2008 UTC

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

Diff Legend

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