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.71 by pcg, Thu Apr 8 20:31:45 2004 UTC vs.
Revision 1.317 by root, Tue Nov 4 15:09:51 2008 UTC

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

Diff Legend

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