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

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

Diff Legend

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