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

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

Diff Legend

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