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

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

Diff Legend

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