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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.66 by pcg, Sun Mar 28 02:07:08 2004 UTC vs.
Revision 1.297 by root, Wed Jan 9 01:14:29 2008 UTC

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

Diff Legend

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