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.38 by pcg, Wed Feb 25 10:26:50 2004 UTC vs.
Revision 1.213 by root, Fri Jan 6 18:33:30 2006 UTC

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

Diff Legend

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