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

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

Diff Legend

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