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.68 by pcg, Sun Apr 4 14:35:00 2004 UTC vs.
Revision 1.280 by ayin, Mon Oct 15 14:56:06 2007 UTC

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

Diff Legend

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