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.14 by pcg, Fri Dec 26 07:42:23 2003 UTC vs.
Revision 1.41 by pcg, Sun Feb 29 15:31:56 2004 UTC

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

Diff Legend

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