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.89 by root, Fri Aug 13 22:38:57 2004 UTC vs.
Revision 1.362 by sf-exg, Sat Jan 8 10:15:36 2011 UTC

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

Diff Legend

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