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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.74 by pcg, Sun May 9 18:19:49 2004 UTC vs.
Revision 1.265 by root, Tue Oct 3 11:56:48 2006 UTC

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

Diff Legend

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