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

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

Diff Legend

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