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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.66 by pcg, Sun Mar 28 02:07:08 2004 UTC vs.
Revision 1.253 by root, Fri Jan 27 18:36:43 2006 UTC

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

Diff Legend

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