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.8 by pcg, Wed Dec 17 09:00:35 2003 UTC vs.
Revision 1.71 by pcg, Thu Apr 8 20:31:45 2004 UTC

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

Diff Legend

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