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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.68 by pcg, Sun Apr 4 14:35:00 2004 UTC vs.
Revision 1.263 by root, Tue Apr 11 11:07:48 2006 UTC

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

Diff Legend

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