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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.66 by pcg, Sun Mar 28 02:07:08 2004 UTC vs.
Revision 1.261 by root, Sat Feb 18 15:44:26 2006 UTC

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

Diff Legend

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