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.9 by pcg, Thu Dec 18 02:07:12 2003 UTC vs.
Revision 1.57 by pcg, Sun Mar 14 17:33:08 2004 UTC

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

Diff Legend

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