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.10 by pcg, Thu Dec 18 08:06:46 2003 UTC vs.
Revision 1.43 by pcg, Wed Mar 3 02:59:53 2004 UTC

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

Diff Legend

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