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.85 by root, Sun Aug 8 16:43:21 2004 UTC vs.
Revision 1.371 by sf-exg, Wed Feb 9 23:07:18 2011 UTC

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

Diff Legend

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