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