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.11 by pcg, Thu Dec 18 13:33:03 2003 UTC vs.
Revision 1.30 by pcg, Fri Feb 13 12:16:21 2004 UTC

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

Diff Legend

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