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

Diff Legend

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