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.74 by pcg, Sun May 9 18:19:49 2004 UTC vs.
Revision 1.290 by root, Fri Dec 14 05:52:34 2007 UTC

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

Diff Legend

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