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.59 by pcg, Mon Mar 15 00:08:11 2004 UTC vs.
Revision 1.279 by sasha, Tue Sep 18 22:01:36 2007 UTC

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

Diff Legend

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