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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.71 by pcg, Thu Apr 8 20:31:45 2004 UTC vs.
Revision 1.297 by root, Wed Jan 9 01:14:29 2008 UTC

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

Diff Legend

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