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.16 by pcg, Fri Jan 16 22:11:09 2004 UTC vs.
Revision 1.66 by pcg, Sun Mar 28 02:07:08 2004 UTC

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

Diff Legend

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